From aef69c9538c7e7101604e042be947e31217844ef Mon Sep 17 00:00:00 2001
From: Anthony Stange <stange@google.com>
Date: Wed, 19 Feb 2020 12:43:57 -0500
Subject: [PATCH] Create separate VTS target for Sensors HAL 2.1

Dependencies don't use cflags set by code that depends on them so the
VTS test for HAL 2.1 wasn't properly pulling the 2.1 interface when
present on the device (it was using the 2.0 interface). Modify the
Android.bp files to define the right flags depending on whether we're
testing HAL 2.0 or 2.1.

Bug: 149759782
Test: atest VtsHalSensorsV2_0TargetTest VtsHalSensorsV2_1TargetTest
Change-Id: I3533b6c244e767a8defe0a44a14025fdeb8eeeba
---
 sensors/2.0/vts/functional/Android.bp |  2 +-
 sensors/2.1/vts/functional/Android.bp |  3 +--
 sensors/common/vts/2_X/Android.bp     | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sensors/2.0/vts/functional/Android.bp b/sensors/2.0/vts/functional/Android.bp
index 22a5091a67..08c59b6378 100644
--- a/sensors/2.0/vts/functional/Android.bp
+++ b/sensors/2.0/vts/functional/Android.bp
@@ -36,7 +36,7 @@ cc_test {
         "android.hardware.sensors@2.1",
         "libfmq",
         "VtsHalSensorsTargetTestUtils",
-        "VtsHalSensorsV2_XTargetTest",
+        "VtsHalSensorsV2_0TargetTest-lib",
     ],
     test_suites: [
         "general-tests",
diff --git a/sensors/2.1/vts/functional/Android.bp b/sensors/2.1/vts/functional/Android.bp
index c92bab3373..c4f5e9d2d7 100644
--- a/sensors/2.1/vts/functional/Android.bp
+++ b/sensors/2.1/vts/functional/Android.bp
@@ -18,7 +18,6 @@ cc_test {
     name: "VtsHalSensorsV2_1TargetTest",
     cflags: [
         "-DLOG_TAG=\"sensors_hidl_hal_test\"",
-        "-DSENSORS_HAL_2_1",
     ],
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: [
@@ -39,7 +38,7 @@ cc_test {
         "android.hardware.sensors@2.1",
         "libfmq",
         "VtsHalSensorsTargetTestUtils",
-        "VtsHalSensorsV2_XTargetTest",
+        "VtsHalSensorsV2_1TargetTest-lib",
     ],
     test_suites: [
         "general-tests",
diff --git a/sensors/common/vts/2_X/Android.bp b/sensors/common/vts/2_X/Android.bp
index 8cf14866c5..8cdb5d181a 100644
--- a/sensors/common/vts/2_X/Android.bp
+++ b/sensors/common/vts/2_X/Android.bp
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-cc_test_library {
-    name: "VtsHalSensorsV2_XTargetTest",
+cc_defaults {
+    name: "VtsHalSensorsV2_XTargetTest-defaults",
     cflags: ["-DLOG_TAG=\"sensors_hidl_hal_test\""],
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: [
@@ -42,3 +42,14 @@ cc_test_library {
         "VtsHalSensorsTargetTestUtils",
     ],
 }
+
+cc_test_library {
+    name: "VtsHalSensorsV2_0TargetTest-lib",
+    defaults: ["VtsHalSensorsV2_XTargetTest-defaults"],
+}
+
+cc_test_library {
+    name: "VtsHalSensorsV2_1TargetTest-lib",
+    cflags: ["-DSENSORS_HAL_2_1"],
+    defaults: ["VtsHalSensorsV2_XTargetTest-defaults"],
+}