ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 24d37b9265

Change-Id: I0a2627b8f14400c352f735dd458e6c19cd52fd70
This commit is contained in:
Tom Cherry 2018-12-05 19:34:46 -08:00 • committed by android-build-merger
commit 7efd2770a0
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init/Android.mk
View file

@ -104,7 +104,6 @@ LOCAL_MODULE := init_system
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)

4
rootdir/Android.mk
View file

@ -9,6 +9,10 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)
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)
#######################################