diff options
| -rw-r--r-- | healthd/Android.mk | 47 | ||||
| -rw-r--r-- | rootdir/init.rc | 3 |
2 files changed, 44 insertions, 6 deletions
diff --git a/healthd/Android.mk b/healthd/Android.mk index 49873aab7..08475f311 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk @@ -78,6 +78,7 @@ endif include $(BUILD_STATIC_LIBRARY) +### charger ### include $(CLEAR_VARS) ifeq ($(strip $(BOARD_CHARGER_NO_UI)),true) LOCAL_CHARGER_NO_UI := true @@ -89,7 +90,7 @@ endif LOCAL_SRC_FILES := \ healthd.cpp -LOCAL_MODULE := healthd +LOCAL_MODULE := charger LOCAL_MODULE_TAGS := optional LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) @@ -134,13 +135,12 @@ endif LOCAL_HAL_STATIC_LIBRARIES := libhealthd -# Symlink /charger to /sbin/healthd +# Symlink /charger to /sbin/charger LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT) \ - && ln -sf /sbin/healthd $(TARGET_ROOT_OUT)/charger + && ln -sf /sbin/charger $(TARGET_ROOT_OUT)/charger include $(BUILD_EXECUTABLE) - ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true) define _add-charger-image include $$(CLEAR_VARS) @@ -168,3 +168,42 @@ include $(BUILD_PHONY_PACKAGE) _add-charger-image := _img_modules := endif # LOCAL_CHARGER_NO_UI + +### healthd ### +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + healthd.cpp + +LOCAL_MODULE := healthd +LOCAL_MODULE_TAGS := optional +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include + +ifneq ($(BOARD_PERIODIC_CHORES_INTERVAL_FAST),) +LOCAL_CFLAGS += -DBOARD_PERIODIC_CHORES_INTERVAL_FAST=$(BOARD_PERIODIC_CHORES_INTERVAL_FAST) +endif +ifneq ($(BOARD_PERIODIC_CHORES_INTERVAL_SLOW),) +LOCAL_CFLAGS += -DBOARD_PERIODIC_CHORES_INTERVAL_SLOW=$(BOARD_PERIODIC_CHORES_INTERVAL_SLOW) +endif + +LOCAL_STATIC_LIBRARIES := \ + libhealthd_android \ + libhealthd_charger \ + libbatterymonitor \ + libbatteryservice \ + +LOCAL_SHARED_LIBRARIES := \ + libbinder \ + libbase \ + libutils \ + libcutils \ + liblog \ + libm \ + libc \ + libminui \ + libpng \ + libz \ + libsuspend \ + +LOCAL_HAL_STATIC_LIBRARIES := libhealthd +include $(BUILD_EXECUTABLE) diff --git a/rootdir/init.rc b/rootdir/init.rc index 31b18210d..c331781d0 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -646,10 +646,9 @@ service ueventd /sbin/ueventd critical seclabel u:r:ueventd:s0 -service healthd /sbin/healthd +service healthd /system/bin/healthd class core critical - seclabel u:r:healthd:s0 group root system wakelock service console /system/bin/sh |