commit a3681954b4241c8322d48a973be038df64ee0af4
author Sandeep Patil <sspatil@google.com> Tue Nov 08 16:27:54 2016 -0800
committer Sandeep Patil <sspatil@google.com> Thu Nov 10 15:19:24 2016 -0800
tree 6b0973c6f665e6351b2f9580ae60015ce1aa4669
parent 29c42c670760ee9d3d1040628335fb2af9270e6c

healthd: start using the new Health hal

Subsequently moves the default board hooks to hardware/interface/health
where the new HAL is defined.

This change removes 'healthd's dependency on libhealthd.<target> static hal.
The dependency has now been *temporarily* moved to the new HAL
implementation in hardware/interfaces/health. 'charger' continues to depend
the static HAL.

Test: Tested healthd with and without a board specific health HAL on
Angler.

Bug: b/32724915

Change-Id: I35b56bacde7ded0517bc960f35538d6ca46e6b06
Signed-off-by: Sandeep Patil <sspatil@google.com>

healthd/Android.mk

diff --git a/healthd/Android.mk b/healthd/Android.mk
index 5a6303e..1a96e88 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -3,16 +3,6 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := healthd_board_default.cpp
-LOCAL_MODULE := libhealthd.default
-LOCAL_CFLAGS := -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := libbinder
-LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libbinder
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := BatteryMonitor.cpp
 LOCAL_MODULE := libbatterymonitor
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
@@ -189,6 +179,7 @@
     libhealthd_android \
     libbatterymonitor \
     libbatteryservice \
+    android.hardware.health@1.0-convert \
 
 LOCAL_SHARED_LIBRARIES := \
     libbinder \
@@ -198,6 +189,7 @@
     liblog \
     libm \
     libc \
+    libhidl \
+    android.hardware.health@1.0 \
 
-LOCAL_HAL_STATIC_LIBRARIES := libhealthd
 include $(BUILD_EXECUTABLE)