Merge "Make BootControlHAL available in recovery"

boot/1.1/default/boot_control/Android.bp

@@ -25,8 +25,6 @@ package {
 
 cc_defaults {
     name: "libboot_control_defaults",
-    vendor: true,
-    recovery_available: true,
     relative_install_path: "hw",
 
     cflags: [
@@ -42,7 +40,7 @@ cc_defaults {
         "liblog",
     ],
     static_libs: [
-        "libbootloader_message_vendor",
+        "libbootloader_message",
         "libfstab",
     ],
 }
@@ -51,6 +49,8 @@ cc_library_static {
     name: "libboot_control",
     defaults: ["libboot_control_defaults"],
     export_include_dirs: ["include"],
+    recovery_available: true,
+    vendor_available: true,
 
     srcs: ["libboot_control.cpp"],
 }
@@ -58,6 +58,8 @@ cc_library_static {
 cc_library_shared {
     name: "bootctrl.default",
     defaults: ["libboot_control_defaults"],
+    recovery_available: true,
+    vendor_available: true,
 
     srcs: ["legacy_boot_control.cpp"],
 

boot/aidl/default/Android.bp

@@ -23,13 +23,11 @@ package {
     default_applicable_licenses: ["hardware_interfaces_license"],
 }
 
-cc_binary {
-    name: "android.hardware.boot-service.default",
-    defaults: ["libboot_control_defaults"],
+cc_defaults {
+    name: "android.hardware.boot-service_common",
     relative_install_path: "hw",
-    init_rc: ["boot-default.rc"],
-    vintf_fragments: ["boot-default.xml"],
-    vendor: true,
+    defaults: ["libboot_control_defaults"],
+    vintf_fragments: ["android.hardware.boot-service.default.xml"],
     shared_libs: [
         "libbase",
         "libbinder_ndk",
@@ -41,3 +39,17 @@ cc_binary {
     ],
     srcs: ["main.cpp", "BootControl.cpp"],
 }
+
+cc_binary {
+    name: "android.hardware.boot-service.default",
+    defaults: ["android.hardware.boot-service_common"],
+    init_rc: ["android.hardware.boot-service.default.rc"],
+    vendor: true,
+}
+
+cc_binary {
+    name: "android.hardware.boot-service.default_recovery",
+    defaults: ["android.hardware.boot-service_common"],
+    init_rc: ["android.hardware.boot-service.default_recovery.rc"],
+    recovery: true,
+}

boot/aidl/default/android.hardware.boot-service.default_recovery.rc

@@ -0,0 +1,7 @@
+service vendor.boot-default /system/bin/hw/android.hardware.boot-service.default_recovery
+    class early_hal
+    user root
+    group root
+    seclabel u:r:hal_bootctl_default:s0
+    interface aidl android.hardware.boot.IBootControl/default
+