From 595003a3d06a13862052ef2f4f578371dae5ad65 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Tue, 28 Jul 2015 15:14:39 -0700 Subject: [PATCH] rootdir: Create symlinks in Android.mk system.img may contain the root directory as well. In that case, we need to create some symlinks init.rc would during the build. Change-Id: I4e7726f38c0f9cd9846c761fad1446738edb52c0 --- rootdir/Android.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index d6dad2da5..30a28513c 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -24,9 +24,18 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) # Put it here instead of in init.rc module definition, # because init.rc is conditionally included. # -# create some directories (some are mount points) -LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ - sbin dev proc sys system data oem acct cache config storage mnt root) +# create some directories (some are mount points) and symlinks +local_post_install_cmd_base := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ + sbin dev proc sys system data oem acct cache config storage mnt root); \ + ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ + ln -sf /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \ + ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard +ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE + LOCAL_POST_INSTALL_CMD := $(local_post_install_cmd_base); mkdir -p $(TARGET_ROOT_OUT)/vendor +else + LOCAL_POST_INSTALL_CMD := $(local_post_install_cmd_base) +endif +local_post_install_cmd_base := include $(BUILD_SYSTEM)/base_rules.mk