commit 0386c840d6e5b322684bdb73b1230d9ff4183d8c
author Kris Alder <kalder@google.com> Thu Jul 08 16:45:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 08 16:45:22 2021 +0000
tree 1dce823da7ed3518d35939aa46c171a2d0fa6535
parent 6cef4e021e3108012c3161a40f82e24c63cd5930
parent 0e9d7c64a4b5aedb74a274adb1c0c9e1ce677588

Merge changes I580e3f1d,I8e271982 am: 8ec315a25e am: 0e9d7c64a4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1723159

Change-Id: I9f4c9427281659972ac607ee28afcc274e1691ac

bluetooth/1.0/default/Android.bp

diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp
index 70a42b7..04e4a16 100644
--- a/bluetooth/1.0/default/Android.bp
+++ b/bluetooth/1.0/default/Android.bp
@@ -22,10 +22,10 @@
     default_applicable_licenses: ["hardware_interfaces_license"],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.hardware.bluetooth@1.0-impl",
     defaults: ["hidl_defaults"],
-    vendor: true,
+    vendor_available: true,
     relative_install_path: "hw",
     srcs: [
         "bluetooth_hci.cc",
@@ -49,7 +49,7 @@
 
 cc_library_static {
     name: "android.hardware.bluetooth-async",
-    vendor: true,
+    vendor_available: true,
     defaults: ["hidl_defaults"],
     srcs: [
         "async_fd_watcher.cc",
@@ -62,7 +62,7 @@
 
 cc_library_static {
     name: "android.hardware.bluetooth-hci",
-    vendor: true,
+    vendor_available: true,
     defaults: ["hidl_defaults"],
     srcs: [
         "hci_packetizer.cc",