commit e1e951700dbea272a564b77646d9b6fe6daf0d1f
author Tom Cherry <tomcherry@google.com> Wed Dec 05 19:34:46 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 19:34:46 2018 -0800
tree 5e783a9988b016470d7d1280c9dfa191c7f38310
parent 9993df49ead598fcb5c8026d24a8e6c315717506
parent e892576f9672dd2656f2f73fc987c7c4317f0e3b

Merge "Fix /init -> /system/bin/init symlink creation race" am: 50f5246352
am: 24d37b9265

Change-Id: I0a2627b8f14400c352f735dd458e6c19cd52fd70

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 0e6ee0b..bdd0301 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -104,7 +104,6 @@
 LOCAL_REQUIRED_MODULES := \
    init_second_stage \
 
-LOCAL_POST_INSTALL_CMD := ln -sf /system/bin/init $(TARGET_ROOT_OUT)/init
 include $(BUILD_PHONY_PACKAGE)
 
 include $(CLEAR_VARS)

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index aad00ad..f88f6b9 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -9,6 +9,10 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
+# The init symlink must be a post install command of a file that is to TARGET_ROOT_OUT.
+# Since init.rc is required for init and satisfies that requirement, we hijack it to create the symlink.
+LOCAL_POST_INSTALL_CMD := ln -sf /system/bin/init $(TARGET_ROOT_OUT)/init
+
 include $(BUILD_PREBUILT)
 
 #######################################