From c96c137850e124f0db93a5b62dd7eb9821e28130 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Mon, 30 Nov 2015 14:33:16 -0800
Subject: Partially revert "healthd: allow custom charger"

* Don't allow custom charger code, prefer to use the existing
  STATIC_HAL_LIBS hook instead.
* Continue to allow devices to replace charger resources, since it's
  just easier to deal with.

This reverts commit 29f7779fdbccb5926a3f74d70c8721fa62e75a0c.

Change-Id: I34289749c852dd92b7d07ddb3edeb3a1589a7330
---
 healthd/Android.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/healthd/Android.mk b/healthd/Android.mk
index ce83b63..e5fffc0 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -13,15 +13,10 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	healthd.cpp \
 	healthd_mode_android.cpp \
+	healthd_mode_charger.cpp \
 	BatteryMonitor.cpp \
 	BatteryPropertiesRegistrar.cpp
 
-ifeq ($(strip $(BOARD_HEALTHD_CUSTOM_CHARGER)),)
-  LOCAL_SRC_FILES += healthd_mode_charger.cpp
-else
-  LOCAL_SRC_FILES += ../../../$(BOARD_HEALTHD_CUSTOM_CHARGER)
-endif
-
 LOCAL_MODULE := healthd
 LOCAL_MODULE_TAGS := optional
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-- 
cgit v1.1