From 8ee048d7509c9b5ef831a508c4c0cf5b5751769d Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@google.com>
Date: Fri, 17 Nov 2023 20:30:02 -0800
Subject: [PATCH] Update recovery to use Health AIDL HAL V3.

Bug: 309792384
Test: m
Change-Id: I253dbee446c88e6a18718cedec090c3be1b56cfd
---
 Android.bp                | 2 +-
 minadbd/Android.bp        | 4 ++--
 recovery_utils/Android.bp | 4 ++--
 tests/Android.bp          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index fba358fd..9b2f80f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",