diff --git a/boot_control/Android.bp b/boot_control/Android.bp
index 0ebce85e..f6a6cedd 100644
--- a/boot_control/Android.bp
+++ b/boot_control/Android.bp
@@ -16,6 +16,7 @@
 
 cc_defaults {
     name: "libboot_control_defaults",
+    vendor: true,
     recovery_available: true,
     relative_install_path: "hw",
 
@@ -28,10 +29,10 @@ cc_defaults {
 
     shared_libs: [
         "libbase",
-        "libbootloader_message",
         "liblog",
     ],
     static_libs: [
+        "libbootloader_message_vendor",
         "libfstab",
     ],
 }
diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp
index 8d72a116..6443a077 100644
--- a/bootloader_message/Android.bp
+++ b/bootloader_message/Android.bp
@@ -56,4 +56,5 @@ cc_library_static {
         "libbootloader_message_defaults",
     ],
     vendor: true,
+    recovery_available: true,
 }