summaryrefslogtreecommitdiffstats
path: root/radio/1.0
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-08-03 20:06:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-08-03 20:06:15 +0000
commit7d149a564fca05be37a7bf3c8e675a565d37eea2 (patch)
treeb2d176ac74c31f2fbe07948c7ea586f5b28b61b9 /radio/1.0
parentc901276e6063e739b742435a161e51978c5f4ec5 (diff)
parent6c2bd86f70f526d69c3f262250e8e09afb773a21 (diff)
downloadplatform_hardware_interfaces-7d149a564fca05be37a7bf3c8e675a565d37eea2.tar.gz
platform_hardware_interfaces-7d149a564fca05be37a7bf3c8e675a565d37eea2.tar.bz2
platform_hardware_interfaces-7d149a564fca05be37a7bf3c8e675a565d37eea2.zip
Merge changes from topic 'vts_deps'
* changes: VTS tests now static link to HAL def libs. Add cc_defaults VtsHalTargetTestDefaults
Diffstat (limited to 'radio/1.0')
-rw-r--r--radio/1.0/vts/functional/Android.bp34
1 files changed, 5 insertions, 29 deletions
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
+}