From e5687ce49225211f8ac75d404465d2c735134f25 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Thu, 28 Sep 2023 07:26:41 +0000 Subject: [PATCH] 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 | 1 - boot/1.1/default/boot_control/Android.bp | 13 +--- boot/1.2/default/Android.bp | 1 - boot/aidl/default/Android.bp | 70 +++---------------- .../android.hardware.boot-service.default.rc | 2 +- boot/aidl/default/apex_file_contexts | 3 - boot/aidl/default/apex_manifest.json | 5 -- 7 files changed, 15 insertions(+), 80 deletions(-) delete mode 100644 boot/aidl/default/apex_file_contexts delete mode 100644 boot/aidl/default/apex_manifest.json diff --git a/boot/1.1/default/Android.bp b/boot/1.1/default/Android.bp index e7a8d6e000..0b0a5b711e 100644 --- a/boot/1.1/default/Android.bp +++ b/boot/1.1/default/Android.bp @@ -20,7 +20,6 @@ cc_library_shared { srcs: ["BootControl.cpp"], shared_libs: [ - "libbase", "liblog", "libhidlbase", "libhardware", diff --git a/boot/1.1/default/boot_control/Android.bp b/boot/1.1/default/boot_control/Android.bp index d0dcb59f5e..6aa30c21fa 100644 --- a/boot/1.1/default/boot_control/Android.bp +++ b/boot/1.1/default/boot_control/Android.bp @@ -35,13 +35,14 @@ cc_defaults { ], shared_libs: [ + "android.hardware.boot@1.1", + "libbase", "liblog", ], static_libs: [ "libbootloader_message", "libfstab", ], - } cc_library_static { @@ -51,13 +52,7 @@ cc_library_static { 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 @@ cc_library_shared { "libboot_control", ], shared_libs: [ - "android.hardware.boot@1.1", - "libbase", "libhardware", ], } diff --git a/boot/1.2/default/Android.bp b/boot/1.2/default/Android.bp index f1e9c34a1b..4e1c35e599 100644 --- a/boot/1.2/default/Android.bp +++ b/boot/1.2/default/Android.bp @@ -20,7 +20,6 @@ cc_library_shared { srcs: ["BootControl.cpp"], shared_libs: [ - "libbase", "liblog", "libhidlbase", "libhardware", diff --git a/boot/aidl/default/Android.bp b/boot/aidl/default/Android.bp index c1d3c575ee..dcb40dbe6a 100644 --- a/boot/aidl/default/Android.bp +++ b/boot/aidl/default/Android.bp @@ -27,77 +27,29 @@ cc_defaults { name: "android.hardware.boot-service_common", relative_install_path: "hw", defaults: ["libboot_control_defaults"], - srcs: [ - "main.cpp", - "BootControl.cpp", + vintf_fragments: ["android.hardware.boot-service.default.xml"], + shared_libs: [ + "libbase", + "libbinder_ndk", + "android.hardware.boot@1.1", + "android.hardware.boot-V1-ndk", ], + static_libs: [ + "libboot_control", + ], + 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, - - stl: "c++_static", - shared_libs: [ - "libbinder_ndk", - "liblog", - ], - static_libs: [ - "android.hardware.boot@1.1", - "android.hardware.boot-V1-ndk", - "libbase", - "libboot_control", - ], - - installable: false, // installed in APEX } cc_binary { name: "android.hardware.boot-service.default_recovery", defaults: ["android.hardware.boot-service_common"], init_rc: ["android.hardware.boot-service.default_recovery.rc"], - vintf_fragments: ["android.hardware.boot-service.default.xml"], recovery: true, - - shared_libs: [ - "libbase", - "libbinder_ndk", - "android.hardware.boot@1.1", - "android.hardware.boot-V1-ndk", - ], - static_libs: [ - "libboot_control", - ], -} - -prebuilt_etc { - name: "android.hardware.boot-service.default.rc", - src: "android.hardware.boot-service.default.rc", - installable: false, -} - -prebuilt_etc { - name: "android.hardware.boot-service.default.xml", - src: "android.hardware.boot-service.default.xml", - sub_dir: "vintf", - installable: false, -} - -apex { - name: "com.android.hardware.boot", - vendor: true, - manifest: "apex_manifest.json", - file_contexts: "apex_file_contexts", - key: "com.android.hardware.key", - certificate: ":com.android.hardware.certificate", - updatable: false, - - binaries: [ - "android.hardware.boot-service.default", - ], - prebuilts: [ - "android.hardware.boot-service.default.rc", - "android.hardware.boot-service.default.xml", - ], } diff --git a/boot/aidl/default/android.hardware.boot-service.default.rc b/boot/aidl/default/android.hardware.boot-service.default.rc index 5090e2c43f..589f803e37 100644 --- a/boot/aidl/default/android.hardware.boot-service.default.rc +++ b/boot/aidl/default/android.hardware.boot-service.default.rc @@ -1,4 +1,4 @@ -service vendor.boot-default /apex/com.android.hardware.boot/bin/hw/android.hardware.boot-service.default +service vendor.boot-default /vendor/bin/hw/android.hardware.boot-service.default class early_hal user root group root diff --git a/boot/aidl/default/apex_file_contexts b/boot/aidl/default/apex_file_contexts deleted file mode 100644 index bf03585d45..0000000000 --- a/boot/aidl/default/apex_file_contexts +++ /dev/null @@ -1,3 +0,0 @@ -(/.*)? u:object_r:vendor_file:s0 -/etc(/.*)? u:object_r:vendor_configs_file:s0 -/bin/hw/android\.hardware\.boot-service\.default u:object_r:hal_bootctl_default_exec:s0 diff --git a/boot/aidl/default/apex_manifest.json b/boot/aidl/default/apex_manifest.json deleted file mode 100644 index 92661c960c..0000000000 --- a/boot/aidl/default/apex_manifest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "com.android.hardware.boot", - "version": 1, - "vendorBootstrap": true -} \ No newline at end of file