diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-24 02:59:04 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-24 02:59:04 +0100 |
| commit | ed5fc4f4b53aba708f6520d29da80beec1a1e7a7 (patch) | |
| tree | 65e04f21e813a28b9ced936b068908bf30224bdf | |
| parent | [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f4d5465366 -s ours (diff) | |
| parent | Merge "Update health AIDL HAL to V2" am: e3ebedd279 (diff) | |
| download | android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.tar android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.tar.gz android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.tar.bz2 android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.tar.lz android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.tar.xz android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.tar.zst android_bootable_recovery-ed5fc4f4b53aba708f6520d29da80beec1a1e7a7.zip | |
| -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
diff --git a/Android.bp b/Android.bp index 4cdeba0f4..d71394269 100644 --- a/Android.bp +++ b/Android.bp @@ -161,7 +161,7 @@ cc_binary { ], shared_libs: [ - "android.hardware.health-V1-ndk", // from librecovery_utils + "android.hardware.health-V2-ndk", // from librecovery_utils "android.hardware.boot-V1-ndk", "librecovery_ui", ], diff --git a/minadbd/Android.bp b/minadbd/Android.bp index 9d3f7334a..c664d740b 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -97,7 +97,7 @@ cc_binary { ], shared_libs: [ - "android.hardware.health-V1-ndk", // from librecovery_utils + "android.hardware.health-V2-ndk", // from librecovery_utils "libbase", "libcrypto", ], @@ -129,7 +129,7 @@ cc_test { ], static_libs: [ - "android.hardware.health-V1-ndk", // from librecovery_utils + "android.hardware.health-V2-ndk", // from librecovery_utils "libminadbd_services", "libfusesideload", "librecovery_utils", diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp index 9bd66c5d9..74392c522 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-V1-ndk.so + // because at the time of writing, android.hardware.health-V2-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-V1-ndk", + "android.hardware.health-V2-ndk", ], export_include_dirs: [ diff --git a/tests/Android.bp b/tests/Android.bp index 0708e855a..b888d474a 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -148,7 +148,7 @@ cc_test { static_libs: libapplypatch_static_libs + librecovery_static_libs + [ "android.hardware.health-translate-ndk", - "android.hardware.health-V1-ndk", + "android.hardware.health-V2-ndk", "libhealthshim", "librecovery_ui", "libfusesideload", |