summaryrefslogtreecommitdiffstats
path: root/healthd
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2013-08-13 15:50:42 -0700
committerTodd Poynor <toddpoynor@google.com>2013-08-13 16:09:12 -0700
commitd65104ca31766922537c79ec2d7647584723407c (patch)
tree26d6422494bcd4e587cfcd5af4de8d0b9f7e9c8d /healthd
parenta41611f638f82cb8066f83b32f2610f0d00dafc6 (diff)
downloadsystem_core-d65104ca31766922537c79ec2d7647584723407c.tar.gz
system_core-d65104ca31766922537c79ec2d7647584723407c.tar.bz2
system_core-d65104ca31766922537c79ec2d7647584723407c.zip
healthd: switch to HAL static libraries
Change-Id: I5a802f9b9a8ad4782c4d0c6376a068aef32a70cb
Diffstat (limited to 'healthd')
-rw-r--r--healthd/Android.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/healthd/Android.mk b/healthd/Android.mk
index cff7a3b98..473d37531 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -3,6 +3,12 @@
ifneq ($(BUILD_TINY_ANDROID),true)
LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := healthd_board_default.cpp
+LOCAL_MODULE := libhealthd.default
+include $(BUILD_STATIC_LIBRARY)
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@@ -17,12 +23,7 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder libz libutils libstdc++ libcutils liblog libm libc
-
-ifdef BOARD_LIB_HEALTHD
-LOCAL_STATIC_LIBRARIES += $(BOARD_LIB_HEALTHD)
-else
-LOCAL_SRC_FILES += healthd_board_default.cpp
-endif
+LOCAL_HAL_STATIC_LIBRARIES := libhealthd
include $(BUILD_EXECUTABLE)