Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topic 'vts_deps'

Browse Source 
* changes:
  VTS tests now static link to HAL def libs.
  Add cc_defaults VtsHalTargetTestDefaults
This commit is contained in:
Treehugger Robot
2017-08-03 20:06:15 +00:00
committed by Gerrit Code Review
parent c901276e60 6c2bd86f70
commit 7d149a564f
7 changed files with 47 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Android.bp
View File

@@ -9,3 +9,26 @@ cc_defaults {
"-Werror", "-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",
],
}

18
bluetooth/1.0/vts/functional/Android.bp
View File

@@ -16,24 +16,10 @@
cc_test { cc_test {
name: "VtsHalBluetoothV1_0TargetTest", name: "VtsHalBluetoothV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"], srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"],
shared_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.bluetooth@1.0",
],
static_libs: [ static_libs: [
"VtsHalHidlTargetTestBase", "android.hardware.bluetooth@1.0",
"libbluetooth-types", "libbluetooth-types",
], ],
cflags: [
"-O0",
"-g",
],
} }

15
ir/1.0/vts/functional/Android.bp
View File

@@ -16,20 +16,9 @@
cc_test { cc_test {
name: "VtsHalIrV1_0TargetTest", name: "VtsHalIrV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalIrV1_0TargetTest.cpp"], srcs: ["VtsHalIrV1_0TargetTest.cpp"],
shared_libs: [ static_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libutils",
"android.hardware.ir@1.0", "android.hardware.ir@1.0",
], ],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",
],
} }

16
nfc/1.0/vts/functional/Android.bp
View File

@@ -16,21 +16,9 @@
cc_test { cc_test {
name: "VtsHalNfcV1_0TargetTest", name: "VtsHalNfcV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalNfcV1_0TargetTest.cpp"], srcs: ["VtsHalNfcV1_0TargetTest.cpp"],
shared_libs: [ static_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.nfc@1.0", "android.hardware.nfc@1.0",
], ],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",
],
} }

32
radio/1.0/vts/functional/Android.bp
View File

@@ -16,7 +16,7 @@
cc_test { cc_test {
name: "VtsHalRadioV1_0TargetTest", name: "VtsHalRadioV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: ["radio_hidl_hal_cell_broadcast.cpp", srcs: ["radio_hidl_hal_cell_broadcast.cpp",
"radio_hidl_hal_data.cpp", "radio_hidl_hal_data.cpp",
"radio_hidl_hal_icc.cpp", "radio_hidl_hal_icc.cpp",
@@ -30,46 +30,22 @@ cc_test {
"radio_response.cpp", "radio_response.cpp",
"VtsHalRadioV1_0TargetTest.cpp", "VtsHalRadioV1_0TargetTest.cpp",
"vts_test_util.cpp"], "vts_test_util.cpp"],
shared_libs: [ static_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.radio@1.0", "android.hardware.radio@1.0",
], ],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",
],
} }
cc_test { cc_test {
name: "VtsHalSapV1_0TargetTest", name: "VtsHalSapV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: ["sap_callback.cpp", srcs: ["sap_callback.cpp",
"sap_hidl_hal_api.cpp", "sap_hidl_hal_api.cpp",
"sap_hidl_hal_test.cpp", "sap_hidl_hal_test.cpp",
"VtsHalSapV1_0TargetTest.cpp", "VtsHalSapV1_0TargetTest.cpp",
"vts_test_util.cpp"], "vts_test_util.cpp"],
shared_libs: [ static_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.radio@1.0", "android.hardware.radio@1.0",
], ],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",
],
} }
cc_library_static { cc_library_static {

18
radio/1.1/vts/functional/Android.bp
View File

@@ -16,31 +16,19 @@
cc_test { cc_test {
name: "VtsHalRadioV1_1TargetTest", name: "VtsHalRadioV1_1TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: ["radio_hidl_hal_api.cpp", srcs: ["radio_hidl_hal_api.cpp",
"radio_hidl_hal_test.cpp", "radio_hidl_hal_test.cpp",
"radio_indication.cpp", "radio_indication.cpp",
"radio_response.cpp", "radio_response.cpp",
"VtsHalRadioV1_1TargetTest.cpp"], "VtsHalRadioV1_1TargetTest.cpp"],
shared_libs: [ static_libs: [
"libbase", "RadioVtsTestUtilBase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.radio@1.1", "android.hardware.radio@1.1",
"android.hardware.radio@1.0", "android.hardware.radio@1.0",
], ],
static_libs: ["VtsHalHidlTargetTestBase",
"RadioVtsTestUtilBase"],
header_libs: [ header_libs: [
"radio.util.header@1.0", "radio.util.header@1.0",
], ],
cflags: [
"-O0",
"-g",
],
} }

40
wifi/1.0/vts/functional/Android.bp
View File

@@ -36,50 +36,30 @@ cc_library_static {
cc_test { cc_test {
name: "VtsHalWifiV1_0TargetTest", name: "VtsHalWifiV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: [ srcs: [
"VtsHalWifiV1_0TargetTest.cpp", "VtsHalWifiV1_0TargetTest.cpp",
"wifi_ap_iface_hidl_test.cpp", "wifi_ap_iface_hidl_test.cpp",
"wifi_chip_hidl_test.cpp", "wifi_chip_hidl_test.cpp",
"wifi_p2p_iface_hidl_test.cpp", "wifi_p2p_iface_hidl_test.cpp",
"wifi_rtt_controller_hidl_test.cpp", "wifi_rtt_controller_hidl_test.cpp",
"wifi_sta_iface_hidl_test.cpp"], "wifi_sta_iface_hidl_test.cpp",
shared_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.wifi@1.0",
], ],
static_libs: ["VtsHalWifiV1_0TargetTestUtil", "VtsHalHidlTargetTestBase"], static_libs: [
cflags: [ "VtsHalWifiV1_0TargetTestUtil",
"-O0", "android.hardware.wifi@1.0",
"-g",
], ],
} }
cc_test { cc_test {
name: "VtsHalWifiNanV1_0TargetTest", name: "VtsHalWifiNanV1_0TargetTest",
defaults: ["hidl_defaults"], defaults: ["VtsHalTargetTestDefaults"],
srcs: [ srcs: [
"VtsHalWifiV1_0TargetTest.cpp", "VtsHalWifiV1_0TargetTest.cpp",
"wifi_nan_iface_hidl_test.cpp"], "wifi_nan_iface_hidl_test.cpp",
shared_libs: [ ],
"libbase", static_libs: [
"liblog", "VtsHalWifiV1_0TargetTestUtil",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libutils",
"android.hardware.wifi@1.0", "android.hardware.wifi@1.0",
], ],
static_libs: ["VtsHalWifiV1_0TargetTestUtil", "VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",
],
} }