From 031163b2c6a6bf7fbcc56c2435222c2053c232ba Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Sat, 1 Nov 2014 15:13:03 -0500 Subject: Remove dependence on build hax in makefiles Update makefiles to no longer rely on INTERNAL_RECOVERY_FILES. Define LOCAL_ADDITIONAL_DEPENDENCIES instead. Set LOCAL_LDFLAGS to properly link recovery executable. Change-Id: I4542104c69399b5a19674b9772ab89c3709efa72 --- applypatch/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'applypatch') diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 98981a6d9..04ddfd874 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -38,6 +38,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := main.c LOCAL_MODULE := applypatch +LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += $(commands_recovery_local_path) LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypttwrp libbz libminelf LOCAL_SHARED_LIBRARIES += libz libcutils libstdc++ libc @@ -49,7 +50,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := main.c LOCAL_MODULE := applypatch_static LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += $(commands_recovery_local_path) LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypttwrp libbz libminelf LOCAL_STATIC_LIBRARIES += libz libcutils libstdc++ libc -- cgit v1.2.3