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",