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

Commit 836a4045 authored by Tom Cherry's avatar Tom Cherry
Browse files

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

Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4
parents 9209d6bc 4897bb57
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 \