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

Merge "Update recovery to use Health AIDL HAL V3." into main am: 74c6581ac5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837349

Change-Id: I7b0141f4f191bdea2e66b3e5635bb1506fae6673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2023-12-12 04:38:55 +00:00 committed by Automerger Merge Worker
commit f6f72ba97f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.bp
View file

@ -162,7 +162,7 @@ cc_binary {
], ],
shared_libs: [ shared_libs: [
"android.hardware.health-V2-ndk", // from librecovery_utils "android.hardware.health-V3-ndk", // from librecovery_utils
"android.hardware.boot-V1-ndk", "android.hardware.boot-V1-ndk",
"librecovery_ui", "librecovery_ui",
], ],

4
minadbd/Android.bp
View file

@ -97,7 +97,7 @@ cc_binary {
], ],
shared_libs: [ shared_libs: [
"android.hardware.health-V2-ndk", // from librecovery_utils "android.hardware.health-V3-ndk", // from librecovery_utils
"libbase", "libbase",
"libcrypto", "libcrypto",
], ],
@ -129,7 +129,7 @@ cc_test {
], ],
static_libs: [ static_libs: [
"android.hardware.health-V2-ndk", // from librecovery_utils "android.hardware.health-V3-ndk", // from librecovery_utils
"libminadbd_services", "libminadbd_services",
"libfusesideload", "libfusesideload",
"librecovery_utils", "librecovery_utils",

4
recovery_utils/Android.bp
View file

@ -75,11 +75,11 @@ cc_library_static {
shared_libs: [ shared_libs: [
// The following cannot be placed in librecovery_utils_defaults, // The following cannot be placed in librecovery_utils_defaults,
// because at the time of writing, android.hardware.health-V2-ndk.so // because at the time of writing, android.hardware.health-V3-ndk.so
// is not installed to the system image yet. (It is installed // is not installed to the system image yet. (It is installed
// to the recovery ramdisk.) Hence, minadbd_test must link to it // to the recovery ramdisk.) Hence, minadbd_test must link to it
// statically. // statically.
"android.hardware.health-V2-ndk", "android.hardware.health-V3-ndk",
], ],
export_include_dirs: [ export_include_dirs: [

2
tests/Android.bp
View file

@ -145,7 +145,7 @@ cc_test {
static_libs: libapplypatch_static_libs + librecovery_static_libs + [ static_libs: libapplypatch_static_libs + librecovery_static_libs + [
"android.hardware.health-translate-ndk", "android.hardware.health-translate-ndk",
"android.hardware.health-V2-ndk", "android.hardware.health-V3-ndk",
"libhealthshim", "libhealthshim",
"librecovery_ui", "librecovery_ui",
"libfusesideload", "libfusesideload",