commit c829836109ed3e14d78dcb14dda0faf14e5617fd
author Jooyung Han <jooyung@google.com> Wed Oct 04 01:03:45 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 04 01:03:45 2023 +0000
tree 98711e3349ff940c2a5a3a2e51fe5c6119323410
parent e5687ce49225211f8ac75d404465d2c735134f25

Revert^2 "Add bootcontrol HAL APEX"

e5687ce49225211f8ac75d404465d2c735134f25

Change-Id: Ie86897efb0380d2ad2884b29ae45126d25d40b34

boot/1.1/default/Android.bp

diff --git a/boot/1.1/default/Android.bp b/boot/1.1/default/Android.bp
index 0b0a5b7..e7a8d6e 100644
--- a/boot/1.1/default/Android.bp
+++ b/boot/1.1/default/Android.bp
@@ -20,6 +20,7 @@
     srcs: ["BootControl.cpp"],
 
     shared_libs: [
+        "libbase",
         "liblog",
         "libhidlbase",
         "libhardware",

boot/1.1/default/boot_control/Android.bp

diff --git a/boot/1.1/default/boot_control/Android.bp b/boot/1.1/default/boot_control/Android.bp
index 6aa30c2..d0dcb59 100644
--- a/boot/1.1/default/boot_control/Android.bp
+++ b/boot/1.1/default/boot_control/Android.bp
@@ -35,14 +35,13 @@
     ],
 
     shared_libs: [
-        "android.hardware.boot@1.1",
-        "libbase",
         "liblog",
     ],
     static_libs: [
         "libbootloader_message",
         "libfstab",
     ],
+
 }
 
 cc_library_static {
@@ -52,7 +51,13 @@
     recovery_available: true,
     vendor_available: true,
 
-    srcs: ["libboot_control.cpp"],
+    srcs: [
+        "libboot_control.cpp",
+    ],
+    static_libs: [
+        "android.hardware.boot@1.1",
+        "libbase",
+    ],
 }
 
 cc_library_shared {
@@ -67,6 +72,8 @@
         "libboot_control",
     ],
     shared_libs: [
+        "android.hardware.boot@1.1",
+        "libbase",
         "libhardware",
     ],
 }