Merge changes from topic 'vts_deps' am: 7d149a564f
am: 7f8774ef80
Change-Id: Ieb521a2e25f9483d68d33a8c9d4b2d957da978c7
This commit is contained in:
commit
3b84dc5c78
7 changed files with 47 additions and 117 deletions
23
Android.bp
23
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",
|
||||
],
|
||||
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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: ["."],
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue