Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af42361 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

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

am: 7efd2770

Change-Id: I4fdbfba827bc95908fcf16133800e89f0c9f576f
parents a7b61c37 7efd2770

init/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,6 @@ LOCAL_MODULE := init_system 
LOCAL_REQUIRED_MODULES := \

LOCAL_REQUIRED_MODULES := \

   init_second_stage \

   init_second_stage \





LOCAL_POST_INSTALL_CMD := ln -sf /system/bin/init $(TARGET_ROOT_OUT)/init

include $(BUILD_PHONY_PACKAGE)

include $(BUILD_PHONY_PACKAGE)





include $(CLEAR_VARS)

include $(CLEAR_VARS)

rootdir/Android.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,10 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE) 
LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

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)

include $(BUILD_PREBUILT)





#######################################

#######################################