commit e8e4c40246a8c15208b70b4467a0d1790c7ce8fb
author Yifan Hong <elsk@google.com> Wed Nov 08 14:56:03 2017 -0800
committer Yifan Hong <elsk@google.com> Tue Nov 14 11:29:53 2017 -0800
tree 935b50cc0e35d900f7b34b7a06cb3711ac1e3135
parent d70f5d924b915b1c7e93c01af6dbe8d30b3b8cc3

is_battery_ok use health 2.0 HAL

Test: call is_battery_ok in graphics test, and test manually
Bug: 69268160
Bug: 63702641

Change-Id: Ifcf4d2e2cb459689c11fc5d1b880bb053aaae8ae

Android.mk

diff --git a/Android.mk b/Android.mk
index d9966b7..50627b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -147,10 +147,21 @@
 LOCAL_C_INCLUDES += \
     system/vold \
 
+# Health HAL dependency
 LOCAL_STATIC_LIBRARIES := \
+    android.hardware.health@2.0-impl \
+    android.hardware.health@2.0 \
+    android.hardware.health@1.0 \
+    android.hardware.health@1.0-convert \
+    libhidltransport \
+    libhidlbase \
+    libhwbinder \
+    libvndksupport \
+    libbatterymonitor
+
+LOCAL_STATIC_LIBRARIES += \
     librecovery \
     libverifier \
-    libbatterymonitor \
     libbootloader_message \
     libfs_mgr \
     libext4_utils \
@@ -169,8 +180,8 @@
     libvintf \
     libtinyxml2 \
     libbase \
-    libcutils \
     libutils \
+    libcutils \
     liblog \
     libselinux \
     libz