commit f6f72ba97f99fad10619a41aa8329af1d753c5ff
author David Anderson <dvander@google.com> Tue Dec 12 04:38:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 12 04:38:55 2023 +0000
tree 486612ad0059eac853b1ffd62798f51e86446675
parent aff8f0072e62e8a71a62c55e0d6b85fde6d41c8f
parent 74c6581ac5e4ca90a1ef9d4aec6c04f40d3f5042

Merge "Update recovery to use Health AIDL HAL V3." into main am: 74c6581ac5

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837349

Change-Id: I7b0141f4f191bdea2e66b3e5635bb1506fae6673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index fba358f..9b2f80f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -162,7 +162,7 @@
     ],
 
     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",
     ],

minadbd/Android.bp

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index c664d74..e96d130 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -97,7 +97,7 @@
     ],
 
     shared_libs: [
-        "android.hardware.health-V2-ndk", // from librecovery_utils
+        "android.hardware.health-V3-ndk", // from librecovery_utils
         "libbase",
         "libcrypto",
     ],
@@ -129,7 +129,7 @@
     ],
 
     static_libs: [
-        "android.hardware.health-V2-ndk", // from librecovery_utils
+        "android.hardware.health-V3-ndk", // from librecovery_utils
         "libminadbd_services",
         "libfusesideload",
         "librecovery_utils",

recovery_utils/Android.bp

diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp
index 74392c5..c31c407 100644
--- a/recovery_utils/Android.bp
+++ b/recovery_utils/Android.bp
@@ -75,11 +75,11 @@
 
     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: [

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index cdfc091..1fd26c4 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -145,7 +145,7 @@
 
     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",