From b1aa65fbb3ab1f608f831396214e2151722069e2 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 20 Sep 2017 13:16:11 -0700 Subject: [PATCH] Loosen libhardware dependency In most places we don't really need the libhardware library, just the headers. Bug: 66187274 Test: compilation test Change-Id: Ifa2f547165fcf8b34bc29ab80d2bd12ce02f4ae1 --- bta/Android.bp | 2 +- btif/Android.bp | 4 ++-- test/rootcanal/Android.bp | 4 ++-- test/suite/Android.bp | 1 + vendor_libs/linux/interface/Android.bp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bta/Android.bp b/bta/Android.bp index a69e174c1..50736dec9 100644 --- a/bta/Android.bp +++ b/bta/Android.bp @@ -118,8 +118,8 @@ cc_test { srcs: [ "test/bta_hf_client_test.cc", ], + header_libs: ["libhardware_headers"], shared_libs: [ - "libhardware", "liblog", "libprotobuf-cpp-lite", ], diff --git a/btif/Android.bp b/btif/Android.bp index c5ff0765f..adc35beef 100644 --- a/btif/Android.bp +++ b/btif/Android.bp @@ -106,9 +106,9 @@ cc_test { defaults: ["fluoride_defaults"], include_dirs: btifCommonIncludes, srcs: ["test/btif_storage_test.cc"], + header_libs: ["libhardware_headers"], shared_libs: [ "liblog", - "libhardware", "libcutils", ], static_libs: [ @@ -131,9 +131,9 @@ cc_test { "src/btif_profile_queue.cc", "test/btif_profile_queue_test.cc" ], + header_libs: ["libhardware_headers"], shared_libs: [ "liblog", - "libhardware", "libcutils", ], static_libs: [ diff --git a/test/rootcanal/Android.bp b/test/rootcanal/Android.bp index 4f263120f..faa0e7ce4 100644 --- a/test/rootcanal/Android.bp +++ b/test/rootcanal/Android.bp @@ -22,12 +22,12 @@ cc_binary { "service.cc", ], + header_libs: ["libhardware_headers"], shared_libs: [ "android.hardware.bluetooth@1.0", "libbase", "libchrome", "libcutils", - "libhardware", "libhwbinder", "libhidlbase", "libhidltransport", @@ -64,12 +64,12 @@ cc_library_shared { "bluetooth_hci.cc", ], + header_libs: ["libhardware_headers"], shared_libs: [ "android.hardware.bluetooth@1.0", "libbase", "libchrome", "libcutils", - "libhardware", "libhidlbase", "libhidltransport", "liblog", diff --git a/test/suite/Android.bp b/test/suite/Android.bp index e4d3a2bee..9fe2fa65e 100644 --- a/test/suite/Android.bp +++ b/test/suite/Android.bp @@ -11,6 +11,7 @@ cc_test { "gatt/gatt_test.cc", "gatt/gatt_unittest.cc", ], + header_libs: ["libhardware_headers"], shared_libs: [ "liblog", "libhardware", diff --git a/vendor_libs/linux/interface/Android.bp b/vendor_libs/linux/interface/Android.bp index 56baf9ef3..937e6edcb 100644 --- a/vendor_libs/linux/interface/Android.bp +++ b/vendor_libs/linux/interface/Android.bp @@ -24,11 +24,11 @@ cc_binary { "async_fd_watcher.cc", "service.cc" ], + header_libs: ["libhardware_headers"], shared_libs: [ "android.hardware.bluetooth@1.0", "libbase", "libcutils", - "libhardware", "libhidlbase", "libhidltransport", "liblog", -- 2.11.0