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

Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
This commit is contained in:
Nick Vaccaro 2016-11-29 11:28:26 -08:00
commit 485c647432

View file

@ -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 \