From 0b19836cea7ee60ac370df2bf0500ee049d38256 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Tue, 1 Aug 2017 13:12:35 -0700 Subject: [PATCH 1/2] Add cc_defaults VtsHalTargetTestDefaults Makes it easier to control how vts tests link to system libs. Also, removes a lot of redundant lines in test make rules. Bug: 64040096 Test: compiles Change-Id: I10796e3fa8f61a307dbb7edace537a96ec83bea7 --- Android.bp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Android.bp b/Android.bp index 79e860993e..6c9bdd348d 100644 --- a/Android.bp +++ b/Android.bp @@ -9,3 +9,26 @@ cc_defaults { "-Werror", ], } + +cc_defaults { + name: "VtsHalTargetTestDefaults", + defaults: ["hidl_defaults"], + static_libs: [ + "VtsHalHidlTargetTestBase", + ], + group_static_libs: true, + shared_libs: [ + "libbase", + "libcutils", + "liblog", + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + ], + cflags: [ + "-O0", + "-g", + ], + +} From 6c2bd86f70f526d69c3f262250e8e09afb773a21 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Tue, 1 Aug 2017 13:14:53 -0700 Subject: [PATCH 2/2] VTS tests now static link to HAL def libs. And use VtsHalTargetTestDefaults. Bug: 64040096 Test: compiles Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152 --- bluetooth/1.0/vts/functional/Android.bp | 18 ++--------- ir/1.0/vts/functional/Android.bp | 15 ++-------- nfc/1.0/vts/functional/Android.bp | 16 ++-------- radio/1.0/vts/functional/Android.bp | 34 ++++----------------- radio/1.1/vts/functional/Android.bp | 18 ++--------- wifi/1.0/vts/functional/Android.bp | 40 +++++++------------------ 6 files changed, 24 insertions(+), 117 deletions(-) diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index cd2be441c2..2e60588c38 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -16,24 +16,10 @@ cc_test { name: "VtsHalBluetoothV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.bluetooth@1.0", - ], static_libs: [ - "VtsHalHidlTargetTestBase", + "android.hardware.bluetooth@1.0", "libbluetooth-types", ], - cflags: [ - "-O0", - "-g", - ], } diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index 4aac2979b1..2a86f8e5d8 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -16,20 +16,9 @@ cc_test { name: "VtsHalIrV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalIrV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libutils", + static_libs: [ "android.hardware.ir@1.0", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index d9ba7021fc..3861bd4694 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -16,21 +16,9 @@ cc_test { name: "VtsHalNfcV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalNfcV1_0TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ "android.hardware.nfc@1.0", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index eb11b54b03..82a8a7292a 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -16,7 +16,7 @@ cc_test { name: "VtsHalRadioV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["radio_hidl_hal_cell_broadcast.cpp", "radio_hidl_hal_data.cpp", "radio_hidl_hal_icc.cpp", @@ -30,46 +30,22 @@ cc_test { "radio_response.cpp", "VtsHalRadioV1_0TargetTest.cpp", "vts_test_util.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ "android.hardware.radio@1.0", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } cc_test { name: "VtsHalSapV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["sap_callback.cpp", "sap_hidl_hal_api.cpp", "sap_hidl_hal_test.cpp", "VtsHalSapV1_0TargetTest.cpp", "vts_test_util.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ "android.hardware.radio@1.0", ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], } cc_library_static { @@ -82,4 +58,4 @@ cc_library_static { cc_library_headers { name: "radio.util.header@1.0", export_include_dirs: ["."], -} \ No newline at end of file +} diff --git a/radio/1.1/vts/functional/Android.bp b/radio/1.1/vts/functional/Android.bp index 6ca802cc91..075d54359f 100644 --- a/radio/1.1/vts/functional/Android.bp +++ b/radio/1.1/vts/functional/Android.bp @@ -16,31 +16,19 @@ cc_test { name: "VtsHalRadioV1_1TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["radio_hidl_hal_api.cpp", "radio_hidl_hal_test.cpp", "radio_indication.cpp", "radio_response.cpp", "VtsHalRadioV1_1TargetTest.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + static_libs: [ + "RadioVtsTestUtilBase", "android.hardware.radio@1.1", "android.hardware.radio@1.0", ], - static_libs: ["VtsHalHidlTargetTestBase", - "RadioVtsTestUtilBase"], header_libs: [ "radio.util.header@1.0", ], - cflags: [ - "-O0", - "-g", - ], } diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index b454a06d81..e164cdf4d6 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -36,50 +36,30 @@ cc_library_static { cc_test { name: "VtsHalWifiV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: [ "VtsHalWifiV1_0TargetTest.cpp", "wifi_ap_iface_hidl_test.cpp", "wifi_chip_hidl_test.cpp", "wifi_p2p_iface_hidl_test.cpp", "wifi_rtt_controller_hidl_test.cpp", - "wifi_sta_iface_hidl_test.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "android.hardware.wifi@1.0", + "wifi_sta_iface_hidl_test.cpp", ], - static_libs: ["VtsHalWifiV1_0TargetTestUtil", "VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", + static_libs: [ + "VtsHalWifiV1_0TargetTestUtil", + "android.hardware.wifi@1.0", ], } cc_test { name: "VtsHalWifiNanV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: [ "VtsHalWifiV1_0TargetTest.cpp", - "wifi_nan_iface_hidl_test.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", + "wifi_nan_iface_hidl_test.cpp", + ], + static_libs: [ + "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", ], - static_libs: ["VtsHalWifiV1_0TargetTestUtil", "VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], }