From d65104ca31766922537c79ec2d7647584723407c Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 13 Aug 2013 15:50:42 -0700 Subject: [PATCH] healthd: switch to HAL static libraries Change-Id: I5a802f9b9a8ad4782c4d0c6376a068aef32a70cb --- healthd/Android.mk | 13 +++++++------ 1 file 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)