summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-25 03:26:02 +0100
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-25 03:26:02 +0100
commitd3bfdd14b8fc1824a20c0a98e92ca63199dbe43b (patch)
tree5cbf15c06908b5bc1aef4523f7ae23b620f10907
parentSnap for 9491836 from dc02500b3e81d3084c3af18940ad014c9eb6700b to udc-release (diff)
parentMerge "Update health AIDL HAL to V2" am: e3ebedd279 am: df7a91962e am: ed5fc4f4b5 (diff)
downloadandroid_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.tar
android_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.tar.gz
android_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.tar.bz2
android_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.tar.lz
android_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.tar.xz
android_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.tar.zst
android_bootable_recovery-d3bfdd14b8fc1824a20c0a98e92ca63199dbe43b.zip
-rw-r--r--Android.bp2
-rw-r--r--minadbd/Android.bp4
-rw-r--r--recovery_utils/Android.bp4
-rw-r--r--tests/Android.bp2
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",