commit 1cc8267aac4e207b6769c96e085c468f023ce1f0
author Kelvin Zhang <zhangkelvin@google.com> Fri Aug 26 19:25:30 2022 +0000
committer Kelvin Zhang <zhangkelvin@google.com> Wed Aug 31 16:23:38 2022 +0000
tree 3d3aedc1a5070ff2196c6173ad30b60027164b58
parent 73754429eecf7fae1f1fb578646e94bbbf789fbe

Make BootControlHAL available in recovery

Test: th
Bug: 227536004
Change-Id: Idd0009f68598c85ef9fe234049851b9b8bd0d893

boot/aidl/default/Android.bp

diff --git a/boot/aidl/default/Android.bp b/boot/aidl/default/Android.bp
index 6aefae8..dcb40db 100644
--- a/boot/aidl/default/Android.bp
+++ b/boot/aidl/default/Android.bp
@@ -23,13 +23,11 @@
     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 @@
     ],
     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,
+}