From bbaf4103f4c23162856949b872408fdcf61175b7 Mon Sep 17 00:00:00 2001
From: Volodymyr Zhdanov <wight554@gmail.com>
Date: Sun, 4 Oct 2020 07:52:27 +0300
Subject: [PATCH] sm6250-common: build qti health@2.1 hal

---
 common.mk    |  5 +++++
 manifest.xml | 10 ----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/common.mk b/common.mk
index 13f040b..86f22d9 100644
--- a/common.mk
+++ b/common.mk
@@ -104,6 +104,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml
 
+# Health
+PRODUCT_PACKAGES += \
+    android.hardware.health@2.1-impl-qti \
+    android.hardware.health@2.1-service
+
 # HIDL
 PRODUCT_PACKAGES += \
     android.hidl.base@1.0 \
diff --git a/manifest.xml b/manifest.xml
index baa7c42..571d894 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -140,16 +140,6 @@
         </interface>
         <fqname>@2.1::IMapper/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::IHealth/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.ir</name>
         <transport>hwbinder</transport>