commit cf0a630371c5053f4a9c13e4c31c691e2ba6c9f3
author David Anderson <dvander@google.com> Tue Sep 03 13:23:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 03 13:23:24 2019 -0700
tree d9fa553e713ee1885081ec4c14e8b294359980f3
parent 7e7a01662a1317068fc402e92b7e44f9b1d9a9a5
parent b9e7f63370740ef3f2d8d745cb7103c58827b9ff

Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c am: bda485070c
am: b9e7f63370

Change-Id: Ia70a4b63248d803c2154044f670539e4023ec3ae

boot_control/Android.bp

diff --git a/boot_control/Android.bp b/boot_control/Android.bp
index 0ebce85..f6a6ced 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 @@
 
     shared_libs: [
         "libbase",
-        "libbootloader_message",
         "liblog",
     ],
     static_libs: [
+        "libbootloader_message_vendor",
         "libfstab",
     ],
 }

bootloader_message/Android.bp

diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp
index 8d72a11..6443a07 100644
--- a/bootloader_message/Android.bp
+++ b/bootloader_message/Android.bp
@@ -56,4 +56,5 @@
         "libbootloader_message_defaults",
     ],
     vendor: true,
+    recovery_available: true,
 }