From 727e0bb3cbce0b00e0c40358aa5a2f55e217e90f Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Tue, 8 Dec 2020 22:03:48 +0000
Subject: [PATCH] sdm660-common: Migrate to Health 2.1 HAL

Change-Id: Ic6302844ac58c16713b43b6871a705b9b4749a96
---
 manifest.xml | 9 ---------
 sdm660.mk    | 4 +++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 10cc73db..7298b034 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -151,15 +151,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>
diff --git a/sdm660.mk b/sdm660.mk
index 3ce7d38e..ac9fa5ca 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -64,6 +64,7 @@ PRODUCT_PACKAGES += \
     android.hardware.boot@1.0-impl \
     android.hardware.boot@1.0-impl.recovery \
     android.hardware.boot@1.0-service \
+    android.hardware.health@2.1-impl.recovery \
     bootctrl.sdm660 \
     bootctrl.sdm660.recovery
 
@@ -269,7 +270,8 @@ PRODUCT_COPY_FILES += \
 
 # Healthd
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-service
+    android.hardware.health@2.1-impl:64 \
+    android.hardware.health@2.1-service
 
 # HIDL
 PRODUCT_PACKAGES += \