diff options
| author | Nick Vaccaro | 2016-11-29 13:28:26 -0600 |
|---|---|---|
| committer | Nick Vaccaro | 2016-11-29 13:28:26 -0600 |
| commit | 485c647432e2ef8a2ae63691d89cb19c7239d96e (patch) | |
| tree | 10b45eab9e1c1e260d6852f32799e149b8e246ff /healthd | |
| parent | f2fabc992642fc82e41a7e1f111ad8c093ba7732 (diff) | |
| parent | e3083dec0fc14c125eadf0bdd94bb9c65d2f6d68 (diff) | |
| download | platform-system-core-485c647432e2ef8a2ae63691d89cb19c7239d96e.tar.gz platform-system-core-485c647432e2ef8a2ae63691d89cb19c7239d96e.tar.xz platform-system-core-485c647432e2ef8a2ae63691d89cb19c7239d96e.zip | |
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/healthd/Android.mk b/healthd/Android.mk index 1c130dc1b..b292725b9 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk | |||
| @@ -21,6 +21,10 @@ LOCAL_STATIC_LIBRARIES := libutils libbase libbinder | |||
| 21 | include $(BUILD_STATIC_LIBRARY) | 21 | include $(BUILD_STATIC_LIBRARY) |
| 22 | 22 | ||
| 23 | include $(CLEAR_VARS) | 23 | include $(CLEAR_VARS) |
| 24 | ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true) | ||
| 25 | LOCAL_CFLAGS += -DCHARGER_ENABLE_SUSPEND | ||
| 26 | LOCAL_SHARED_LIBRARIES += libsuspend | ||
| 27 | endif | ||
| 24 | LOCAL_SRC_FILES := \ | 28 | LOCAL_SRC_FILES := \ |
| 25 | healthd_mode_android.cpp \ | 29 | healthd_mode_android.cpp \ |
| 26 | healthd_mode_charger.cpp \ | 30 | healthd_mode_charger.cpp \ |