commit e5687ce49225211f8ac75d404465d2c735134f25
author Isaac Chiou <isaacchiou@google.com> Thu Sep 28 07:26:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 28 07:26:41 2023 +0000
tree 3a3e3a45ea95d3730127c62441655f06201ab0cb
parent ac5383d20451cce7f58ada1b67757dc902afe3db

Revert "Add bootcontrol HAL APEX"

Revert submission 2756126-bootcontrol-hal-apex

Reason for revert: Fix BB for b/301548350

Reverted changes: /q/submissionid:2756126-bootcontrol-hal-apex

Change-Id: Ia0da4a4983030f3a1bc4ff717e845e34ce9cfaa7

boot/1.1/default/Android.bp

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