resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp

Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4
This commit is contained in:
Tom Cherry 2016-10-24 22:15:12 -07:00
commit 836a404525

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 \