From 9d7be4d265f001c41d7542cf4d5034ae7bbe99bf Mon Sep 17 00:00:00 2001
From: SamarV-121 <samarvispute121@gmail.com>
Date: Sun, 27 Jun 2021 16:14:19 +0530
Subject: [PATCH] universal7885: Compile Health HAL from source

Change-Id: I437e8a002fad3af59d7e410e94329a9bbb40afe5
Signed-off-by: SamarV-121 <samarvispute121@gmail.com>
---
 manifest.xml            | 10 ----------
 proprietary-files.txt   |  2 --
 universal7904-common.mk |  5 +++++
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index dfea44b..219fb64 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -328,16 +328,6 @@
         </interface>
         <fqname>@2.0::ISehGnss/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISehHealth</name>
-            <instance>sehhealth</instance>
-        </interface>
-        <fqname>@1.0::ISehHealth/sehhealth</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.light</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 32e613b..d9b191c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -23,7 +23,6 @@ vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin
 vendor/app/mcRegistry/ffffffffd00000000000000000000045.drbin
 vendor/bin/cbd
 vendor/bin/hw/android.hardware.drm@1.2-service.widevine
-vendor/bin/hw/android.hardware.health@2.0-service.samsung
 vendor/bin/hw/android.hardware.wifi@1.0-service
 vendor/bin/hw/gpsd
 vendor/bin/hw/hostapd
@@ -72,7 +71,6 @@ vendor/etc/gnss/ca.pem
 vendor/etc/gnss/gps.cfg
 vendor/etc/hearing_aid_audio_policy_configuration.xml
 vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc
-vendor/etc/init/android.hardware.health@2.0-service.samsung.rc
 vendor/etc/init/android.hardware.wifi@1.0-service.rc
 vendor/etc/init/hostapd.android.rc
 vendor/etc/init/init.baseband.rc
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 02ba8c5..e183517 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -59,6 +59,11 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@2.0-impl \
     libgui_vendor
 
+# Health
+PRODUCT_PACKAGES += \
+    android.hardware.health@2.0-impl \
+    android.hardware.health@2.0-service
+
 # HIDL
 PRODUCT_PACKAGES += \
     libhidltransport \