commit 39057b2f3495779641d6c53bc86e4c9f2bcb1e51
author Nick Vaccaro <nvaccaro@google.com> Tue Nov 29 21:39:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 29 21:39:14 2016 +0000
tree dcaf7dbbad5ed6d2a3525f2bbda66d578605b5f9
parent b693bf317db5124ec625060a422970ea4658b844
parent f8a2cdb0e81a7970e6154c10121eb8beec2de895

Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

healthd/Android.mk

diff --git a/healthd/Android.mk b/healthd/Android.mk
index 1c130dc..b292725 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -21,6 +21,10 @@
 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 \