From dbb78d65c09b7d731871af93cc91e8a64949608d Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 24 Nov 2014 15:43:34 -0800
Subject: [PATCH] Use LOCAL_POST_INSTALL_CMD to simplify symlink creation.

Change-Id: I67ad7248c26561d394e66901e90ef5814ec69fb3
---
 init/Android.mk | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/init/Android.mk b/init/Android.mk
index 72c22724d..8cda87926 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -51,25 +51,9 @@ LOCAL_STATIC_LIBRARIES := \
 	libmincrypt \
 	libext4_utils_static
 
-LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+# Create symlinks
+LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
+    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
+    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
 include $(BUILD_EXECUTABLE)
-
-# Make a symlink from /sbin/ueventd and /sbin/watchdogd to /init
-SYMLINKS := \
-	$(TARGET_ROOT_OUT)/sbin/ueventd \
-	$(TARGET_ROOT_OUT)/sbin/watchdogd
-
-$(SYMLINKS): INIT_BINARY := $(LOCAL_MODULE)
-$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
-	@echo "Symlink: $@ -> ../$(INIT_BINARY)"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf ../$(INIT_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)