commit 388d2a591c140b7d5f2914771d035db4be1af37b
author David Anderson <dvander@google.com> Tue Sep 03 13:00:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 03 13:00:16 2019 -0700
tree d9fa553e713ee1885081ec4c14e8b294359980f3
parent 754e7fc190eb839ed0c7de1836e4d4f3ae9f3444
parent e3a35dc808f50d53a8ca1fd20b0424febd611e6b

Merge "Make libboot_control vendor available."
am: e3a35dc808

Change-Id: Ia5661bdf289cbff91faf629f6b746920b0299a8e

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