From: Tri Vo Date: Thu, 3 Aug 2017 23:37:47 +0000 (-0700) Subject: VTS tests now static link to HAL def libs. #2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=0c2ce357b11bc18e0c1ff775968ea3179ae38a8b;p=android-x86%2Fhardware-interfaces.git 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 --- 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 @@ cc_test { name: "VtsHalBiometricsFingerprintV2_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "libhidltransport", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "android.hardware.biometrics.fingerprint@2.1", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.biometrics.fingerprint@2.1"], } 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 @@ cc_test { name: "VtsHalBootV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBootV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libnativehelper", - "libutils", - "android.hardware.boot@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.boot@1.0"], } 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 @@ cc_test { name: "VtsHalBroadcastradioV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBroadcastradioV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.broadcastradio@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.broadcastradio@1.0"], } 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 @@ cc_test { name: "VtsHalBroadcastradioV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBroadcastradioV1_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ "android.hardware.broadcastradio@1.0", "android.hardware.broadcastradio@1.1", - ], - static_libs: [ - "VtsHalHidlTargetTestBase", "android.hardware.broadcastradio@1.1-utils-lib", "android.hardware.broadcastradio@1.1-vts-utils-lib", "libgmock", ], - cflags: [ - "-Wextra", - "-O0", - "-g", - ], } 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 @@ cc_test { name: "VtsHalConfigstoreV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "libutils", - "android.hardware.configstore@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.configstore@1.0"], } 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 @@ cc_test { name: "VtsHalConfigstoreV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalConfigstoreV1_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "libutils", + static_libs: [ + "android.hardware.configstore@1.0", "android.hardware.configstore@1.1", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] } 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 @@ cc_test { name: "VtsHalContexthubV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalContexthubV1_0TargetTest.cpp"], - shared_libs: [ - "liblog", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.contexthub@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.contexthub@1.0"], } 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 @@ cc_test { name: "VtsHalDumpstateV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalDumpstateV1_0TargetTest.cpp"], - shared_libs: [ - "android.hardware.dumpstate@1.0", - "libcutils", - "libhidlbase", - "liblog", - "libutils", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.dumpstate@1.0"], } 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 @@ cc_test { name: "VtsHalGatekeeperV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.gatekeeper@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.gatekeeper@1.0"], } 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 @@ cc_test { name: "VtsHalGnssV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGnssV1_0TargetTest.cpp"], - shared_libs: [ - "android.hardware.gnss@1.0", - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libnativehelper", - "libutils", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], -} \ No newline at end of file + static_libs: ["android.hardware.gnss@1.0"], +} 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 @@ cc_test { name: "VtsHalHealthV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalHealthV1_0TargetTest.cpp"], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "android.hardware.health@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.health@1.0"], } 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 @@ cc_test { name: "VtsHalLightV2_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalLightV2_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "libutils", - "android.hardware.light@2.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.light@2.0"], } 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 @@ cc_test { name: "VtsHalMemtrackV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhardware", - "libhidlbase", - "libutils", - "android.hardware.memtrack@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.memtrack@1.0"], } 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 @@ cc_test { name: "VtsHalOemLockV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalOemLockV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.oemlock@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.oemlock@1.0"], } 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 @@ cc_test { name: "VtsHalPowerV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalPowerV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.power@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.power@1.0"], } 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 @@ cc_test { name: "VtsHalPowerV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalPowerV1_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libhidlbase", - "libhidltransport", - "libutils", + static_libs: [ + "android.hardware.power@1.0", "android.hardware.power@1.1", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] } 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 @@ cc_test { name: "VtsHalSensorsV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalSensorsV1_0TargetTest.cpp"], - shared_libs: [ - "android.hardware.sensors@1.0", - "libcutils", - "libhidlbase", - "liblog", - "libutils", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.sensors@1.0"], } 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 @@ cc_test { name: "VtsHalSoundtriggerV2_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.soundtrigger@2.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.soundtrigger@2.0"], } 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 @@ cc_test { name: "VtsHalThermalV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalThermalV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.thermal@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.thermal@1.0"], } 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 @@ cc_test { name: "VtsHalTvInputV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTvInputV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.tv.input@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.tv.input@1.0"], } 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 @@ cc_test { name: "VtsHalUsbV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalUsbV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.usb@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.usb@1.0"], } 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 @@ cc_test { name: "VtsHalUsbV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalUsbV1_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ "android.hardware.usb@1.0", "android.hardware.usb@1.1", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } 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 @@ cc_test { name: "VtsHalVibratorV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVibratorV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "libutils", - "android.hardware.vibrator@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.vibrator@1.0"], } 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 @@ cc_test { name: "VtsHalVibratorV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVibratorV1_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "libhidlbase", - "liblog", - "libutils", + static_libs: [ + "android.hardware.vibrator@1.0", "android.hardware.vibrator@1.1", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } 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 @@ cc_test { name: "VtsHalVrV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVrV1_0TargetTest.cpp"], - shared_libs: [ - "liblog", - "libhidlbase", - "libutils", - "android.hardware.vr@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ] + static_libs: ["android.hardware.vr@1.0"], } 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 @@ cc_test { name: "VtsHalWeaverV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWeaverV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.weaver@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.weaver@1.0"], } 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 @@ cc_test { name: "VtsHalWifiV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: [ "VtsHalWifiV1_1TargetTest.cpp", "wifi_chip_hidl_test.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ + "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", ], - static_libs: ["VtsHalWifiV1_0TargetTestUtil", "VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } 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 @@ cc_test { name: "VtsHalWifiOffloadV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWifiOffloadV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.wifi.offload@1.0", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.wifi.offload@1.0"], }