commit 031163b2c6a6bf7fbcc56c2435222c2053c232ba
author Matt Mower <mowerm@gmail.com> Sat Nov 01 15:13:03 2014 -0500
committer Ethan Yonker <dees_troy@teamw.in> Mon Nov 03 13:36:03 2014 -0600
tree 8616358a85fe0d7cf846b367e5813b8a9991ad8d
parent b53fcaa35f2f4785cda16382973434657f3e34fc

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

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 98981a6..04ddfd8 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -38,6 +38,7 @@
 
 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 @@
 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