commit bb23b65a019b2f792e6a973b381f4f38c181d86f
author Tom Cherry <tomcherry@google.com> Tue Oct 25 05:42:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 05:42:05 2016 +0000
tree f3b56f786d2a3531e4c729ed3045235a0f615174
parent 61c7aa19dcb0889fd78430be1be5b4e99b3609cc
parent 71e159ed5aaaf62458822dd4dc6bd7e1cad3d63e

resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp
am: 836a404525

Change-Id: I56ca4033b9359c9626a1e8d963e57036d21e2cfb

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 \