tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add bootcontrol HAL APEX"" into main am: ac9f70ee2f am: 3beb387558 am: d29b94b7a0 am: 322a636b99

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766666

Change-Id: I9ea1daa00df0a0a2f0c1bf00d896e75c4741ac38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-30 07:05:23 +00:00 committed by Automerger Merge Worker
commit 844c90145e
7 changed files with 15 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boot/1.1/default/Android.bp
View file

@ -20,7 +20,6 @@ cc_library_shared {
srcs: ["BootControl.cpp"],
shared_libs: [
"libbase",
"liblog",
"libhidlbase",
"libhardware",

13
boot/1.1/default/boot_control/Android.bp
View file

@ -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",
],
}

1
boot/1.2/default/Android.bp
View file

@ -20,7 +20,6 @@ cc_library_shared {
srcs: ["BootControl.cpp"],
shared_libs: [
"libbase",
"liblog",
"libhidlbase",
"libhardware",

70
boot/aidl/default/Android.bp
View file

@ -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",
],
}

2
boot/aidl/default/android.hardware.boot-service.default.rc
View file

@ -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

3
boot/aidl/default/apex_file_contexts
View file

@ -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

5
boot/aidl/default/apex_manifest.json
View file

@ -1,5 +0,0 @@
{
"name": "com.android.hardware.boot",
"version": 1,
"vendorBootstrap": true
}