From a8621b138dfd0496dbe521d394bf94676d7d01b0 Mon Sep 17 00:00:00 2001
From: Xindong Xu<xindong.xu@amlogic.com>
Date: Wed, 27  Jun  2018  02:25:35  +0000
Subject: Merge "darwin:update from 1.0 to 2.0[1/1]" into p-amlogic

---
diff --git a/device.mk b/device.mk
index 1ce636a..2d380a5 100644
--- a/device.mk
+++ b/device.mk
@@ -89,3 +89,11 @@ $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-he
 # set default USB configuration
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     persist.sys.usb.config=mtp
+
+#To remove healthd from the build
+PRODUCT_PACKAGES += android.hardware.health@2.0-service.override
+DEVICE_FRAMEWORK_MANIFEST_FILE += \
+	system/libhidl/vintfdata/manifest_healthd_exclude.xml
+
+#To keep healthd in the build
+PRODUCT_PACKAGES += android.hardware.health@2.0-service
diff --git a/manifest.xml b/manifest.xml
index 9526021..85e3946 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -246,7 +246,7 @@
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>2.0</version>
         <interface>
             <name>IHealth</name>
             <instance>default</instance>
--
cgit