diff options
author | Todd Poynor <toddpoynor@google.com> | 2016-02-17 21:39:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-17 21:39:40 +0000 |
commit | 6355bc8d5b140d43557223c8969a05e0566d0117 (patch) | |
tree | 7d7087eda0115d3e8b81fd327485817279cdec2a /healthd | |
parent | c10b039d2812b7de939218b77a7552b6e643dcc7 (diff) | |
parent | fdd26c961d654df7ab068591a9fce7945719c90d (diff) | |
download | system_core-6355bc8d5b140d43557223c8969a05e0566d0117.tar.gz system_core-6355bc8d5b140d43557223c8969a05e0566d0117.tar.bz2 system_core-6355bc8d5b140d43557223c8969a05e0566d0117.zip |
Merge "healthd: Add "No UI" operation for charger mode"
am: fdd26c961d
* commit 'fdd26c961d654df7ab068591a9fce7945719c90d':
healthd: Add "No UI" operation for charger mode
Diffstat (limited to 'healthd')
-rw-r--r-- | healthd/Android.mk | 26 | ||||
-rw-r--r-- | healthd/healthd.cpp | 7 |
2 files changed, 31 insertions, 2 deletions
diff --git a/healthd/Android.mk b/healthd/Android.mk index 27c985c46..5d207e37e 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk @@ -10,13 +10,23 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +ifeq ($(strip $(BOARD_CHARGER_NO_UI)),true) +LOCAL_CHARGER_NO_UI := true +endif +ifdef BRILLO +LOCAL_CHARGER_NO_UI := true +endif + LOCAL_SRC_FILES := \ healthd.cpp \ healthd_mode_android.cpp \ - healthd_mode_charger.cpp \ BatteryMonitor.cpp \ BatteryPropertiesRegistrar.cpp +ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true) +LOCAL_SRC_FILES += healthd_mode_charger.cpp +endif + LOCAL_MODULE := healthd LOCAL_MODULE_TAGS := optional LOCAL_FORCE_STATIC_EXECUTABLE := true @@ -33,9 +43,19 @@ ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true) LOCAL_CFLAGS += -DCHARGER_ENABLE_SUSPEND endif +ifeq ($(strip $(LOCAL_CHARGER_NO_UI)),true) +LOCAL_CFLAGS += -DCHARGER_NO_UI +endif + LOCAL_C_INCLUDES := bootable/recovery -LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder libminui libpng libz libutils libcutils liblog libm libc +LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder + +ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true) +LOCAL_STATIC_LIBRARIES += libminui libpng libz +endif + +LOCAL_STATIC_LIBRARIES += libutils libcutils liblog libm libc ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true) LOCAL_STATIC_LIBRARIES += libsuspend @@ -50,6 +70,7 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT) \ include $(BUILD_EXECUTABLE) +ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true) define _add-charger-image include $$(CLEAR_VARS) LOCAL_MODULE := system_core_charger_$(notdir $(1)) @@ -75,3 +96,4 @@ include $(BUILD_PHONY_PACKAGE) _add-charger-image := _img_modules := +endif # LOCAL_CHARGER_NO_UI diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp index 85888c3ca..9b47334d3 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -109,10 +109,17 @@ static struct healthd_mode_ops android_ops = { }; static struct healthd_mode_ops charger_ops = { +#ifdef CHARGER_NO_UI + .init = healthd_mode_nop_init, + .preparetowait = healthd_mode_nop_preparetowait, + .heartbeat = healthd_mode_nop_heartbeat, + .battery_update = healthd_mode_nop_battery_update, +#else .init = healthd_mode_charger_init, .preparetowait = healthd_mode_charger_preparetowait, .heartbeat = healthd_mode_charger_heartbeat, .battery_update = healthd_mode_charger_battery_update, +#endif }; static struct healthd_mode_ops recovery_ops = { |