Update recovery to use Health AIDL HAL V3.

Bug: 309792384
Test: m
Change-Id: I253dbee446c88e6a18718cedec090c3be1b56cfd
This commit is contained in:
David Anderson 2023-11-17 20:30:02 -08:00
parent 1fb40d753a
commit 8ee048d750
4 changed files with 6 additions and 6 deletions

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

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",

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: [

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",