summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTri Vo2017-08-03 18:37:47 -0500
committerTri Vo2017-08-10 12:44:57 -0500
commit0c2ce357b11bc18e0c1ff775968ea3179ae38a8b (patch)
treefd0387b109dbbeee784cc06b5b0dd1b4c7b5bb33
parentcc1007af3350bd1a3c001da968a56655c7780cde (diff)
downloadplatform-hardware-interfaces-0c2ce357b11bc18e0c1ff775968ea3179ae38a8b.tar.gz
platform-hardware-interfaces-0c2ce357b11bc18e0c1ff775968ea3179ae38a8b.tar.xz
platform-hardware-interfaces-0c2ce357b11bc18e0c1ff775968ea3179ae38a8b.zip
VTS tests now static link to HAL def libs. #2
And use VtsHalTargetTestDefaults. Bug: 64040096 Test: crop out all non-affected tests from vts-hal-hidl.xml and run vts-tradefed run commandAndExit vts-hal-hidl --skip-all-system-status-check --skip-preconditions 2 failures, same as without this change: GatekeeperHidlTest.DeleteAllUsersTest GatekeeperHidlTest.DeleteUserTest Change-Id: I8f6995e9536a9aefe283ee3effec9f5a7f03b620
-rw-r--r--biometrics/fingerprint/2.1/vts/functional/Android.bp17
-rw-r--r--boot/1.0/vts/functional/Android.bp17
-rw-r--r--broadcastradio/1.0/vts/functional/Android.bp18
-rw-r--r--broadcastradio/1.1/vts/functional/Android.bp19
-rw-r--r--configstore/1.0/vts/functional/Android.bp15
-rw-r--r--configstore/1.1/vts/functional/Android.bp14
-rw-r--r--contexthub/1.0/vts/functional/Android.bp15
-rw-r--r--dumpstate/1.0/vts/functional/Android.bp15
-rw-r--r--gatekeeper/1.0/vts/functional/Android.bp18
-rw-r--r--gnss/1.0/vts/functional/Android.bp20
-rw-r--r--health/1.0/vts/functional/Android.bp14
-rw-r--r--light/2.0/vts/functional/Android.bp15
-rw-r--r--memtrack/1.0/vts/functional/Android.bp17
-rw-r--r--oemlock/1.0/vts/functional/Android.bp18
-rw-r--r--power/1.0/vts/functional/Android.bp18
-rw-r--r--power/1.1/vts/functional/Android.bp15
-rw-r--r--sensors/1.0/vts/functional/Android.bp15
-rw-r--r--soundtrigger/2.0/vts/functional/Android.bp18
-rw-r--r--thermal/1.0/vts/functional/Android.bp18
-rw-r--r--tv/input/1.0/vts/functional/Android.bp18
-rw-r--r--usb/1.0/vts/functional/Android.bp18
-rw-r--r--usb/1.1/vts/functional/Android.bp16
-rw-r--r--vibrator/1.0/vts/functional/Android.bp15
-rw-r--r--vibrator/1.1/vts/functional/Android.bp14
-rw-r--r--vr/1.0/vts/functional/Android.bp14
-rw-r--r--weaver/1.0/vts/functional/Android.bp18
-rw-r--r--wifi/1.1/vts/functional/Android.bp17
-rw-r--r--wifi/offload/1.0/vts/functional/Android.bp18
28 files changed, 61 insertions, 403 deletions
diff --git a/biometrics/fingerprint/2.1/vts/functional/Android.bp b/biometrics/fingerprint/2.1/vts/functional/Android.bp
index 27b71577..bee3657e 100644
--- a/biometrics/fingerprint/2.1/vts/functional/Android.bp
+++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp
@@ -16,21 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalBiometricsFingerprintV2_1TargetTest", 18 name: "VtsHalBiometricsFingerprintV2_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"], 20 srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.biometrics.fingerprint@2.1"],
22 "libbase",
23 "libhidltransport",
24 "libhardware",
25 "libhidlbase",
26 "liblog",
27 "libutils",
28 "android.hardware.biometrics.fingerprint@2.1",
29 ],
30 static_libs: ["VtsHalHidlTargetTestBase"],
31 cflags: [
32 "-O0",
33 "-g",
34 ]
35} 22}
36 23
diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp
index 5b14f54d..2ef89f3a 100644
--- a/boot/1.0/vts/functional/Android.bp
+++ b/boot/1.0/vts/functional/Android.bp
@@ -16,20 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalBootV1_0TargetTest", 18 name: "VtsHalBootV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalBootV1_0TargetTest.cpp"], 20 srcs: ["VtsHalBootV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.boot@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libnativehelper",
27 "libutils",
28 "android.hardware.boot@1.0",
29 ],
30 static_libs: ["VtsHalHidlTargetTestBase"],
31 cflags: [
32 "-O0",
33 "-g",
34 ]
35} 22}
diff --git a/broadcastradio/1.0/vts/functional/Android.bp b/broadcastradio/1.0/vts/functional/Android.bp
index cf52f497..f31a2dcf 100644
--- a/broadcastradio/1.0/vts/functional/Android.bp
+++ b/broadcastradio/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalBroadcastradioV1_0TargetTest", 18 name: "VtsHalBroadcastradioV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalBroadcastradioV1_0TargetTest.cpp"], 20 srcs: ["VtsHalBroadcastradioV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.broadcastradio@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.broadcastradio@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}
diff --git a/broadcastradio/1.1/vts/functional/Android.bp b/broadcastradio/1.1/vts/functional/Android.bp
index 6e5c84cd..4b93cbcf 100644
--- a/broadcastradio/1.1/vts/functional/Android.bp
+++ b/broadcastradio/1.1/vts/functional/Android.bp
@@ -16,28 +16,13 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalBroadcastradioV1_1TargetTest", 18 name: "VtsHalBroadcastradioV1_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalBroadcastradioV1_1TargetTest.cpp"], 20 srcs: ["VtsHalBroadcastradioV1_1TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: [
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.broadcastradio@1.0", 22 "android.hardware.broadcastradio@1.0",
30 "android.hardware.broadcastradio@1.1", 23 "android.hardware.broadcastradio@1.1",
31 ],
32 static_libs: [
33 "VtsHalHidlTargetTestBase",
34 "android.hardware.broadcastradio@1.1-utils-lib", 24 "android.hardware.broadcastradio@1.1-utils-lib",
35 "android.hardware.broadcastradio@1.1-vts-utils-lib", 25 "android.hardware.broadcastradio@1.1-vts-utils-lib",
36 "libgmock", 26 "libgmock",
37 ], 27 ],
38 cflags: [
39 "-Wextra",
40 "-O0",
41 "-g",
42 ],
43} 28}
diff --git a/configstore/1.0/vts/functional/Android.bp b/configstore/1.0/vts/functional/Android.bp
index 17755389..1b8a5913 100644
--- a/configstore/1.0/vts/functional/Android.bp
+++ b/configstore/1.0/vts/functional/Android.bp
@@ -16,19 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalConfigstoreV1_0TargetTest", 18 name: "VtsHalConfigstoreV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"], 20 srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.configstore@1.0"],
22 "libbase",
23 "libhidlbase",
24 "liblog",
25 "libutils",
26 "android.hardware.configstore@1.0",
27 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ]
33} 22}
34 23
diff --git a/configstore/1.1/vts/functional/Android.bp b/configstore/1.1/vts/functional/Android.bp
index 5cfa4839..59beb09c 100644
--- a/configstore/1.1/vts/functional/Android.bp
+++ b/configstore/1.1/vts/functional/Android.bp
@@ -16,19 +16,11 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalConfigstoreV1_1TargetTest", 18 name: "VtsHalConfigstoreV1_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalConfigstoreV1_1TargetTest.cpp"], 20 srcs: ["VtsHalConfigstoreV1_1TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: [
22 "libbase", 22 "android.hardware.configstore@1.0",
23 "libhidlbase",
24 "liblog",
25 "libutils",
26 "android.hardware.configstore@1.1", 23 "android.hardware.configstore@1.1",
27 ], 24 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ]
33} 25}
34 26
diff --git a/contexthub/1.0/vts/functional/Android.bp b/contexthub/1.0/vts/functional/Android.bp
index c35386d1..7c6e8c73 100644
--- a/contexthub/1.0/vts/functional/Android.bp
+++ b/contexthub/1.0/vts/functional/Android.bp
@@ -16,19 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalContexthubV1_0TargetTest", 18 name: "VtsHalContexthubV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalContexthubV1_0TargetTest.cpp"], 20 srcs: ["VtsHalContexthubV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.contexthub@1.0"],
22 "liblog",
23 "libhidlbase",
24 "libhidltransport",
25 "libutils",
26 "android.hardware.contexthub@1.0",
27 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ]
33} 22}
34 23
diff --git a/dumpstate/1.0/vts/functional/Android.bp b/dumpstate/1.0/vts/functional/Android.bp
index a1c735b1..1ab530fe 100644
--- a/dumpstate/1.0/vts/functional/Android.bp
+++ b/dumpstate/1.0/vts/functional/Android.bp
@@ -15,18 +15,7 @@
15 15
16cc_test { 16cc_test {
17 name: "VtsHalDumpstateV1_0TargetTest", 17 name: "VtsHalDumpstateV1_0TargetTest",
18 defaults: ["hidl_defaults"], 18 defaults: ["VtsHalTargetTestDefaults"],
19 srcs: ["VtsHalDumpstateV1_0TargetTest.cpp"], 19 srcs: ["VtsHalDumpstateV1_0TargetTest.cpp"],
20 shared_libs: [ 20 static_libs: ["android.hardware.dumpstate@1.0"],
21 "android.hardware.dumpstate@1.0",
22 "libcutils",
23 "libhidlbase",
24 "liblog",
25 "libutils",
26 ],
27 static_libs: ["VtsHalHidlTargetTestBase"],
28 cflags: [
29 "-O0",
30 "-g",
31 ]
32} 21}
diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp
index 70cb6158..aa1da7bb 100644
--- a/gatekeeper/1.0/vts/functional/Android.bp
+++ b/gatekeeper/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalGatekeeperV1_0TargetTest", 18 name: "VtsHalGatekeeperV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"], 20 srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.gatekeeper@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.gatekeeper@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ]
36} 22}
diff --git a/gnss/1.0/vts/functional/Android.bp b/gnss/1.0/vts/functional/Android.bp
index 6d960596..d7713dbc 100644
--- a/gnss/1.0/vts/functional/Android.bp
+++ b/gnss/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalGnssV1_0TargetTest", 18 name: "VtsHalGnssV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalGnssV1_0TargetTest.cpp"], 20 srcs: ["VtsHalGnssV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.gnss@1.0"],
22 "android.hardware.gnss@1.0", 22}
23 "libbase",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "liblog",
28 "libnativehelper",
29 "libutils",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} \ No newline at end of file
diff --git a/health/1.0/vts/functional/Android.bp b/health/1.0/vts/functional/Android.bp
index 1a4c8c83..8742651b 100644
--- a/health/1.0/vts/functional/Android.bp
+++ b/health/1.0/vts/functional/Android.bp
@@ -16,17 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalHealthV1_0TargetTest", 18 name: "VtsHalHealthV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalHealthV1_0TargetTest.cpp"], 20 srcs: ["VtsHalHealthV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.health@1.0"],
22 "libhidlbase",
23 "liblog",
24 "libutils",
25 "android.hardware.health@1.0",
26 ],
27 static_libs: ["VtsHalHidlTargetTestBase"],
28 cflags: [
29 "-O0",
30 "-g",
31 ]
32} 22}
diff --git a/light/2.0/vts/functional/Android.bp b/light/2.0/vts/functional/Android.bp
index 0558ff27..e0ec4cf1 100644
--- a/light/2.0/vts/functional/Android.bp
+++ b/light/2.0/vts/functional/Android.bp
@@ -16,19 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalLightV2_0TargetTest", 18 name: "VtsHalLightV2_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalLightV2_0TargetTest.cpp"], 20 srcs: ["VtsHalLightV2_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.light@2.0"],
22 "libbase",
23 "libhidlbase",
24 "liblog",
25 "libutils",
26 "android.hardware.light@2.0",
27 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ]
33} 22}
34 23
diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp
index 71e61114..2d833e76 100644
--- a/memtrack/1.0/vts/functional/Android.bp
+++ b/memtrack/1.0/vts/functional/Android.bp
@@ -16,20 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalMemtrackV1_0TargetTest", 18 name: "VtsHalMemtrackV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"], 20 srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.memtrack@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhardware",
26 "libhidlbase",
27 "libutils",
28 "android.hardware.memtrack@1.0",
29 ],
30 static_libs: ["VtsHalHidlTargetTestBase"],
31 cflags: [
32 "-O0",
33 "-g",
34 ]
35} 22}
diff --git a/oemlock/1.0/vts/functional/Android.bp b/oemlock/1.0/vts/functional/Android.bp
index a13b3dc7..20737a18 100644
--- a/oemlock/1.0/vts/functional/Android.bp
+++ b/oemlock/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalOemLockV1_0TargetTest", 18 name: "VtsHalOemLockV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalOemLockV1_0TargetTest.cpp"], 20 srcs: ["VtsHalOemLockV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.oemlock@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.oemlock@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}
diff --git a/power/1.0/vts/functional/Android.bp b/power/1.0/vts/functional/Android.bp
index 5ab1eb4c..45f74fc7 100644
--- a/power/1.0/vts/functional/Android.bp
+++ b/power/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalPowerV1_0TargetTest", 18 name: "VtsHalPowerV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalPowerV1_0TargetTest.cpp"], 20 srcs: ["VtsHalPowerV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.power@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.power@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ]
36} 22}
diff --git a/power/1.1/vts/functional/Android.bp b/power/1.1/vts/functional/Android.bp
index f886bd2c..604cd36e 100644
--- a/power/1.1/vts/functional/Android.bp
+++ b/power/1.1/vts/functional/Android.bp
@@ -16,19 +16,10 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalPowerV1_1TargetTest", 18 name: "VtsHalPowerV1_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalPowerV1_1TargetTest.cpp"], 20 srcs: ["VtsHalPowerV1_1TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: [
22 "libbase", 22 "android.hardware.power@1.0",
23 "liblog",
24 "libhidlbase",
25 "libhidltransport",
26 "libutils",
27 "android.hardware.power@1.1", 23 "android.hardware.power@1.1",
28 ], 24 ],
29 static_libs: ["VtsHalHidlTargetTestBase"],
30 cflags: [
31 "-O0",
32 "-g",
33 ]
34} 25}
diff --git a/sensors/1.0/vts/functional/Android.bp b/sensors/1.0/vts/functional/Android.bp
index af149ba0..a49307da 100644
--- a/sensors/1.0/vts/functional/Android.bp
+++ b/sensors/1.0/vts/functional/Android.bp
@@ -16,19 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalSensorsV1_0TargetTest", 18 name: "VtsHalSensorsV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalSensorsV1_0TargetTest.cpp"], 20 srcs: ["VtsHalSensorsV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.sensors@1.0"],
22 "android.hardware.sensors@1.0",
23 "libcutils",
24 "libhidlbase",
25 "liblog",
26 "libutils",
27 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ],
33} 22}
34 23
diff --git a/soundtrigger/2.0/vts/functional/Android.bp b/soundtrigger/2.0/vts/functional/Android.bp
index 8f0cc4eb..be6b3a80 100644
--- a/soundtrigger/2.0/vts/functional/Android.bp
+++ b/soundtrigger/2.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalSoundtriggerV2_0TargetTest", 18 name: "VtsHalSoundtriggerV2_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"], 20 srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.soundtrigger@2.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.soundtrigger@2.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}
diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp
index 90468821..f661f1e1 100644
--- a/thermal/1.0/vts/functional/Android.bp
+++ b/thermal/1.0/vts/functional/Android.bp
@@ -16,22 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalThermalV1_0TargetTest", 18 name: "VtsHalThermalV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalThermalV1_0TargetTest.cpp"], 20 srcs: ["VtsHalThermalV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.thermal@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.thermal@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}
37 23
diff --git a/tv/input/1.0/vts/functional/Android.bp b/tv/input/1.0/vts/functional/Android.bp
index c8624297..978830c4 100644
--- a/tv/input/1.0/vts/functional/Android.bp
+++ b/tv/input/1.0/vts/functional/Android.bp
@@ -16,22 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalTvInputV1_0TargetTest", 18 name: "VtsHalTvInputV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalTvInputV1_0TargetTest.cpp"], 20 srcs: ["VtsHalTvInputV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.tv.input@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.tv.input@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ]
36} 22}
37 23
diff --git a/usb/1.0/vts/functional/Android.bp b/usb/1.0/vts/functional/Android.bp
index 7438bc74..96d3c0ef 100644
--- a/usb/1.0/vts/functional/Android.bp
+++ b/usb/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalUsbV1_0TargetTest", 18 name: "VtsHalUsbV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalUsbV1_0TargetTest.cpp"], 20 srcs: ["VtsHalUsbV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.usb@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.usb@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}
diff --git a/usb/1.1/vts/functional/Android.bp b/usb/1.1/vts/functional/Android.bp
index 820f794b..4bb32036 100644
--- a/usb/1.1/vts/functional/Android.bp
+++ b/usb/1.1/vts/functional/Android.bp
@@ -16,23 +16,11 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalUsbV1_1TargetTest", 18 name: "VtsHalUsbV1_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalUsbV1_1TargetTest.cpp"], 20 srcs: ["VtsHalUsbV1_1TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: [
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.usb@1.0", 22 "android.hardware.usb@1.0",
30 "android.hardware.usb@1.1", 23 "android.hardware.usb@1.1",
31 ], 24 ],
32 static_libs: ["VtsHalHidlTargetTestBase"],
33 cflags: [
34 "-O0",
35 "-g",
36 ],
37} 25}
38 26
diff --git a/vibrator/1.0/vts/functional/Android.bp b/vibrator/1.0/vts/functional/Android.bp
index 9e25def1..016d627b 100644
--- a/vibrator/1.0/vts/functional/Android.bp
+++ b/vibrator/1.0/vts/functional/Android.bp
@@ -16,19 +16,8 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalVibratorV1_0TargetTest", 18 name: "VtsHalVibratorV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalVibratorV1_0TargetTest.cpp"], 20 srcs: ["VtsHalVibratorV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.vibrator@1.0"],
22 "libbase",
23 "libhidlbase",
24 "liblog",
25 "libutils",
26 "android.hardware.vibrator@1.0",
27 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ],
33} 22}
34 23
diff --git a/vibrator/1.1/vts/functional/Android.bp b/vibrator/1.1/vts/functional/Android.bp
index 5baa8ed7..4f6454b6 100644
--- a/vibrator/1.1/vts/functional/Android.bp
+++ b/vibrator/1.1/vts/functional/Android.bp
@@ -16,19 +16,11 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalVibratorV1_1TargetTest", 18 name: "VtsHalVibratorV1_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalVibratorV1_1TargetTest.cpp"], 20 srcs: ["VtsHalVibratorV1_1TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: [
22 "libbase", 22 "android.hardware.vibrator@1.0",
23 "libhidlbase",
24 "liblog",
25 "libutils",
26 "android.hardware.vibrator@1.1", 23 "android.hardware.vibrator@1.1",
27 ], 24 ],
28 static_libs: ["VtsHalHidlTargetTestBase"],
29 cflags: [
30 "-O0",
31 "-g",
32 ],
33} 25}
34 26
diff --git a/vr/1.0/vts/functional/Android.bp b/vr/1.0/vts/functional/Android.bp
index 5d5a99a1..40291377 100644
--- a/vr/1.0/vts/functional/Android.bp
+++ b/vr/1.0/vts/functional/Android.bp
@@ -16,17 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalVrV1_0TargetTest", 18 name: "VtsHalVrV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalVrV1_0TargetTest.cpp"], 20 srcs: ["VtsHalVrV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.vr@1.0"],
22 "liblog",
23 "libhidlbase",
24 "libutils",
25 "android.hardware.vr@1.0",
26 ],
27 static_libs: ["VtsHalHidlTargetTestBase"],
28 cflags: [
29 "-O0",
30 "-g",
31 ]
32} 22}
diff --git a/weaver/1.0/vts/functional/Android.bp b/weaver/1.0/vts/functional/Android.bp
index 9b0ff6df..0089d890 100644
--- a/weaver/1.0/vts/functional/Android.bp
+++ b/weaver/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalWeaverV1_0TargetTest", 18 name: "VtsHalWeaverV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalWeaverV1_0TargetTest.cpp"], 20 srcs: ["VtsHalWeaverV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.weaver@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.weaver@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}
diff --git a/wifi/1.1/vts/functional/Android.bp b/wifi/1.1/vts/functional/Android.bp
index 6b0baf78..1b0c12d6 100644
--- a/wifi/1.1/vts/functional/Android.bp
+++ b/wifi/1.1/vts/functional/Android.bp
@@ -16,24 +16,13 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalWifiV1_1TargetTest", 18 name: "VtsHalWifiV1_1TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: [ 20 srcs: [
21 "VtsHalWifiV1_1TargetTest.cpp", 21 "VtsHalWifiV1_1TargetTest.cpp",
22 "wifi_chip_hidl_test.cpp"], 22 "wifi_chip_hidl_test.cpp"],
23 shared_libs: [ 23 static_libs: [
24 "libbase", 24 "VtsHalWifiV1_0TargetTestUtil",
25 "liblog",
26 "libcutils",
27 "libhidlbase",
28 "libhidltransport",
29 "libnativehelper",
30 "libutils",
31 "android.hardware.wifi@1.0", 25 "android.hardware.wifi@1.0",
32 "android.hardware.wifi@1.1", 26 "android.hardware.wifi@1.1",
33 ], 27 ],
34 static_libs: ["VtsHalWifiV1_0TargetTestUtil", "VtsHalHidlTargetTestBase"],
35 cflags: [
36 "-O0",
37 "-g",
38 ],
39} 28}
diff --git a/wifi/offload/1.0/vts/functional/Android.bp b/wifi/offload/1.0/vts/functional/Android.bp
index f907a895..140e45e2 100644
--- a/wifi/offload/1.0/vts/functional/Android.bp
+++ b/wifi/offload/1.0/vts/functional/Android.bp
@@ -16,21 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalWifiOffloadV1_0TargetTest", 18 name: "VtsHalWifiOffloadV1_0TargetTest",
19 defaults: ["hidl_defaults"], 19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalWifiOffloadV1_0TargetTest.cpp"], 20 srcs: ["VtsHalWifiOffloadV1_0TargetTest.cpp"],
21 shared_libs: [ 21 static_libs: ["android.hardware.wifi.offload@1.0"],
22 "libbase",
23 "liblog",
24 "libcutils",
25 "libhidlbase",
26 "libhidltransport",
27 "libnativehelper",
28 "libutils",
29 "android.hardware.wifi.offload@1.0",
30 ],
31 static_libs: ["VtsHalHidlTargetTestBase"],
32 cflags: [
33 "-O0",
34 "-g",
35 ],
36} 22}