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

diff --git a/bta/Android.bp b/bta/Android.bp
index a69e174..50736de 100644 (file)
--- 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 c5ff076..adc35be 100644 (file)
--- 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 4f26312..faa0e7c 100644 (file)
--- 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 e4d3a2b..9fe2fa6 100644 (file)
--- 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 56baf9e..937e6ed 100644 (file)
--- 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",