diff options
| author | Tom Cherry <tomcherry@google.com> | 2016-10-24 22:15:12 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2016-10-24 22:15:12 -0700 |
| commit | 836a4045256b61c0025c3ee3b5d9f66c9f67546e (patch) | |
| tree | 12f1e99f7c6436eb62a7eeadb973e41111f573c9 /healthd | |
| parent | 9209d6bc16c609451764cc299e34193629845b09 (diff) | |
| parent | 4897bb57e413eba8c7a56390940e8d3a746c81d5 (diff) | |
| download | system_core-836a4045256b61c0025c3ee3b5d9f66c9f67546e.tar.gz system_core-836a4045256b61c0025c3ee3b5d9f66c9f67546e.tar.bz2 system_core-836a4045256b61c0025c3ee3b5d9f66c9f67546e.zip | |
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp
Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4
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 include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true) +LOCAL_CFLAGS += -DCHARGER_ENABLE_SUSPEND +LOCAL_SHARED_LIBRARIES += libsuspend +endif LOCAL_SRC_FILES := \ healthd_mode_android.cpp \ healthd_mode_charger.cpp \ |