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

Commit 969f4395 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

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

am: 836a4045

Change-Id: I56ca4033b9359c9626a1e8d963e57036d21e2cfb
parents 30b37fa7 836a4045

healthd/Android.mk

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