diff options
| author | David Anderson <dvander@google.com> | 2023-12-12 05:09:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-12 05:09:30 +0000 |
| commit | 84f236dc27f8bdc39857eeb95d25fe64a91df44d (patch) | |
| tree | 486612ad0059eac853b1ffd62798f51e86446675 | |
| parent | fa7a73f8452ae767b7ed588cfb13e0c84ffa9eaf (diff) | |
| parent | f6f72ba97f99fad10619a41aa8329af1d753c5ff (diff) | |
| download | recovery-84f236dc27f8bdc39857eeb95d25fe64a91df44d.tar.gz | |
Merge "Update recovery to use Health AIDL HAL V3." into main am: 74c6581ac5 am: f6f72ba97f
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837349
Change-Id: I2b682880506b4f157923915b78b155ac1472dd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | minadbd/Android.bp | 4 | ||||
| -rw-r--r-- | recovery_utils/Android.bp | 4 | ||||
| -rw-r--r-- | tests/Android.bp | 2 |
4 files changed, 6 insertions, 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", ], diff --git a/minadbd/Android.bp b/minadbd/Android.bp index c664d740..e96d130e 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -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", diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp index 74392c52..c31c4073 100644 --- a/recovery_utils/Android.bp +++ b/recovery_utils/Android.bp @@ -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: [ diff --git a/tests/Android.bp b/tests/Android.bp index cdfc0918..1fd26c4b 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -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", |