commit b47f28b05ad67417aaf94969726af5005e10c99b
author Dees Troy <dees_troy@teamw.in> Thu Dec 11 17:20:59 2014 +0000
committer Dees Troy <dees_troy@teamw.in> Fri Dec 12 15:20:55 2014 +0100
tree 046a19aad3eb9f7e2304dd4fdf5a3762a33491ef
parent 452e420a2ec339592f5590abbc5dec4ea764521d

Fix generating symlinks for older trees

Symlinks for unpigz, toolbox, and busybox were not generating in
older trees.

Change-Id: I3ca2a2047510954e66fb3cf49eef6af713d3268e

toolbox/Android.mk

diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index c43c05b..a08e78d 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -337,6 +337,15 @@
 	@rm -rf $@
 	$(hide) ln -sf $(TOOLBOX_BINARY) $@
 
+ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
+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)
+endif
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := toolbox_symlinks
 LOCAL_MODULE_TAGS := optional