Merge "Update recovery to use Health AIDL HAL V3." into main
This commit is contained in:
commit
74c6581ac5
4 changed files with 6 additions and 6 deletions
|
@ -162,7 +162,7 @@ cc_binary {
|
|||
],
|
||||
|
||||
shared_libs: [
|
||||
"android.hardware.health-V2-ndk", // from librecovery_utils
|
||||
"android.hardware.health-V3-ndk", // from librecovery_utils
|
||||
"android.hardware.boot-V1-ndk",
|
||||
"librecovery_ui",
|
||||
],
|
||||
|
|
|
@ -97,7 +97,7 @@ cc_binary {
|
|||
],
|
||||
|
||||
shared_libs: [
|
||||
"android.hardware.health-V2-ndk", // from librecovery_utils
|
||||
"android.hardware.health-V3-ndk", // from librecovery_utils
|
||||
"libbase",
|
||||
"libcrypto",
|
||||
],
|
||||
|
@ -129,7 +129,7 @@ cc_test {
|
|||
],
|
||||
|
||||
static_libs: [
|
||||
"android.hardware.health-V2-ndk", // from librecovery_utils
|
||||
"android.hardware.health-V3-ndk", // from librecovery_utils
|
||||
"libminadbd_services",
|
||||
"libfusesideload",
|
||||
"librecovery_utils",
|
||||
|
|
|
@ -75,11 +75,11 @@ cc_library_static {
|
|||
|
||||
shared_libs: [
|
||||
// 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
|
||||
// to the recovery ramdisk.) Hence, minadbd_test must link to it
|
||||
// statically.
|
||||
"android.hardware.health-V2-ndk",
|
||||
"android.hardware.health-V3-ndk",
|
||||
],
|
||||
|
||||
export_include_dirs: [
|
||||
|
|
|
@ -145,7 +145,7 @@ cc_test {
|
|||
|
||||
static_libs: libapplypatch_static_libs + librecovery_static_libs + [
|
||||
"android.hardware.health-translate-ndk",
|
||||
"android.hardware.health-V2-ndk",
|
||||
"android.hardware.health-V3-ndk",
|
||||
"libhealthshim",
|
||||
"librecovery_ui",
|
||||
"libfusesideload",
|
||||
|
|
Loading…
Reference in a new issue