commit 047e30d9a49cef61769099753d88a5a20d04ba7c
author David Anderson <dvander@google.com> Tue Sep 03 13:28:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 03 13:28:22 2019 -0700
tree e0b0ca8c80a88fd0c29304ea77b20d82fe17aa4f
parent 0019bdf79c765cfbb92ac11608e10413ddb8194c
parent cf0a630371c5053f4a9c13e4c31c691e2ba6c9f3

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

Change-Id: I2f40f3184a10be17d96c6c7f6253830da143c95e

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