diff options
| author | Daniel Rosenberg <drosen@google.com> | 2015-11-02 21:58:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-02 21:58:22 +0000 |
| commit | 64ea814c312ec43c59e9f132909be121cdf02ab3 (patch) | |
| tree | 2c5123bb80f00068975e138fa571ca100550d2fd /rootdir | |
| parent | bb12b91ae1e3caf83e1d775d4e823d82b2336a37 (diff) | |
| parent | 6e699df21e1b08aa2e9eb18ef1c44788549ae8ed (diff) | |
| download | system_core-64ea814c312ec43c59e9f132909be121cdf02ab3.tar.gz system_core-64ea814c312ec43c59e9f132909be121cdf02ab3.tar.bz2 system_core-64ea814c312ec43c59e9f132909be121cdf02ab3.zip | |
Merge "rootdir: Allow board specific folders and symlinks in root directory"
am: 6e699df21e
* commit '6e699df21e1b08aa2e9eb18ef1c44788549ae8ed':
rootdir: Allow board specific folders and symlinks in root directory
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 8b1699634..b134f9353 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -41,17 +41,21 @@ endif # because init.rc is conditionally included. # # 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); \ +LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ + sbin dev proc sys system data oem acct cache config storage mnt root $(BOARD_ROOT_EXTRA_FOLDERS)); \ 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) + LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/vendor +endif +ifdef BOARD_ROOT_EXTRA_SYMLINKS +# BOARD_ROOT_EXTRA_SYMLINKS is a list of <target>:<link_name>. + LOCAL_POST_INSTALL_CMD += $(foreach s, $(BOARD_ROOT_EXTRA_SYMLINKS),\ + $(eval p := $(subst :,$(space),$(s)))\ + ; mkdir -p $(dir $(TARGET_ROOT_OUT)/$(word 2,$(p))) \ + ; ln -sf $(word 1,$(p)) $(TARGET_ROOT_OUT)/$(word 2,$(p))) endif -local_post_install_cmd_base := include $(BUILD_SYSTEM)/base_rules.mk |