commit 5d4884ad4a64980a8fdaeae255878c7dda261c3a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 19 19:41:41 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 19:41:41 2020 +0000
tree 730096dc4295f9cecb778506f5a2b9d8f8a2365a
parent 44f9c690fa3639f05a1026c5145ef83e685ed382
parent aef69c9538c7e7101604e042be947e31217844ef

Merge "Create separate VTS target for Sensors HAL 2.1"

sensors/2.0/vts/functional/Android.bp

diff --git a/sensors/2.0/vts/functional/Android.bp b/sensors/2.0/vts/functional/Android.bp
index 22a5091..08c59b6 100644
--- a/sensors/2.0/vts/functional/Android.bp
+++ b/sensors/2.0/vts/functional/Android.bp
@@ -36,7 +36,7 @@
         "android.hardware.sensors@2.1",
         "libfmq",
         "VtsHalSensorsTargetTestUtils",
-        "VtsHalSensorsV2_XTargetTest",
+        "VtsHalSensorsV2_0TargetTest-lib",
     ],
     test_suites: [
         "general-tests",

sensors/2.1/vts/functional/Android.bp

diff --git a/sensors/2.1/vts/functional/Android.bp b/sensors/2.1/vts/functional/Android.bp
index c92bab3..c4f5e9d 100644
--- a/sensors/2.1/vts/functional/Android.bp
+++ b/sensors/2.1/vts/functional/Android.bp
@@ -18,7 +18,6 @@
     name: "VtsHalSensorsV2_1TargetTest",
     cflags: [
         "-DLOG_TAG=\"sensors_hidl_hal_test\"",
-        "-DSENSORS_HAL_2_1",
     ],
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: [
@@ -39,7 +38,7 @@
         "android.hardware.sensors@2.1",
         "libfmq",
         "VtsHalSensorsTargetTestUtils",
-        "VtsHalSensorsV2_XTargetTest",
+        "VtsHalSensorsV2_1TargetTest-lib",
     ],
     test_suites: [
         "general-tests",

sensors/common/vts/2_X/Android.bp

diff --git a/sensors/common/vts/2_X/Android.bp b/sensors/common/vts/2_X/Android.bp
index 8cf1486..8cdb5d1 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 @@
         "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"],
+}