From 031163b2c6a6bf7fbcc56c2435222c2053c232ba Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
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
---
 toolbox/Android.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'toolbox')

diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 053660ab1..8a96c81ef 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -141,9 +141,9 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
 	@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 :=
-- 
cgit v1.2.3