From b47f28b05ad67417aaf94969726af5005e10c99b Mon Sep 17 00:00:00 2001
From: Dees Troy <dees_troy@teamw.in>
Date: Thu, 11 Dec 2014 17:20:59 +0000
Subject: Fix generating symlinks for older trees

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

Change-Id: I3ca2a2047510954e66fb3cf49eef6af713d3268e
---
 Android.mk         | 3 +++
 pigz/Android.mk    | 9 +++++++++
 toolbox/Android.mk | 9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/Android.mk b/Android.mk
index 130575fea..e909baae3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -394,6 +394,9 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := busybox_symlinks
 LOCAL_MODULE_TAGS := optional
 LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
+ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
+ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS)
+endif
 include $(BUILD_PHONY_PACKAGE)
 RECOVERY_BUSYBOX_SYMLINKS :=
 endif # !TW_USE_TOOLBOX
diff --git a/pigz/Android.mk b/pigz/Android.mk
index 9b9313da8..9fff2f95c 100644
--- a/pigz/Android.mk
+++ b/pigz/Android.mk
@@ -23,6 +23,15 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@rm -rf $@
 	$(hide) ln -sf $(PIGZ_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 := unpigz_symlink
 LOCAL_MODULE_TAGS := optional
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index c43c05b04..a08e78d38 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -337,6 +337,15 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
 	@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
-- 
cgit v1.2.3