From ae581bc02d60bc87e4ec7248b65b4c57a7f02a8a Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Tue, 29 Sep 2020 10:45:23 +0100
Subject: [PATCH] msm8974-common: Build 2.1 health HAL

The devices fail to boot otherwise.

Change-Id: I5bc6ae361a5319224b87ef6a4d7127b6b5bc9a97
---
 manifest.xml | 9 ---------
 msm8974.mk   | 5 +++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index ff31db5..6e5658d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -93,15 +93,6 @@
             <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>backup</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.ir</name>
         <transport>hwbinder</transport>
diff --git a/msm8974.mk b/msm8974.mk
index fd36f75..1b1d396 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -111,6 +111,11 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gps/etc/izat.conf:system/etc/izat.conf \
     $(LOCAL_PATH)/gps/etc/sap.conf:system/etc/sap.conf
 
+# Health
+PRODUCT_PACKAGES += \
+    android.hardware.health@2.1-impl \
+    android.hardware.health@2.1-service
+
 # IR Blaster
 PRODUCT_PACKAGES += \
     android.hardware.ir@1.0-service.samsung