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

toolbox/Android.mk

diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 053660a..8a96c81 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -141,9 +141,9 @@
 	@rm -rf $@
 	$(hide) ln -sf $(TOOLBOX_BINARY) $@
 
-ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
-
-# We need this so that the installed files could be picked up based on the
-# local module name
-ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
-    $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS)
+include $(CLEAR_VARS)
+LOCAL_MODULE := toolbox_symlinks
+LOCAL_MODULE_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
+include $(BUILD_PHONY_PACKAGE)
+SYMLINKS :=