diff options
| author | Yuexi Ma <yuexima@google.com> | 2018-03-26 16:05:07 -0700 |
|---|---|---|
| committer | Yuexi Ma <yuexima@google.com> | 2018-03-26 16:05:07 -0700 |
| commit | 8ef11932b98b5633a3d428e4e141a2602433dcd7 (patch) | |
| tree | 8d0086e4adfaa7485d7be505d69c2f3a5225472f /wifi/1.0/vts | |
| parent | 49ace4694467f0372100429b7ba8ba8f60566297 (diff) | |
| parent | 07ff5f43761273cadfbbe67aad5b86e1209e8775 (diff) | |
| download | android_hardware_interfaces-8ef11932b98b5633a3d428e4e141a2602433dcd7.tar.gz android_hardware_interfaces-8ef11932b98b5633a3d428e4e141a2602433dcd7.tar.bz2 android_hardware_interfaces-8ef11932b98b5633a3d428e4e141a2602433dcd7.zip | |
resolve merge conflicts of 07ff5f43761273cadfbbe67aad5b86e1209e8775 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id636c3171bffffeaf7a30a7912c38796e5a4c780
Diffstat (limited to 'wifi/1.0/vts')
| -rw-r--r-- | wifi/1.0/vts/functional/Android.bp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index b2f76a31a..6522f4d1b 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -16,7 +16,7 @@ cc_library_static { name: "VtsHalWifiV1_0TargetTestUtil", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: [ "wifi_hidl_call_util_selftest.cpp", "wifi_hidl_test.cpp", @@ -26,16 +26,9 @@ cc_library_static { "." ], shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", "libnativehelper", - "libutils", - "android.hardware.wifi@1.0", ], - static_libs: ["VtsHalHidlTargetTestBase"], + static_libs: ["android.hardware.wifi@1.0"], } cc_test { |