Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485c6474 authored by Nick Vaccaro's avatar Nick Vaccaro
Browse files

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

Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
parents f2fabc99 e3083dec
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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 \