diff options
| author | Neil Fuller <nfuller@google.com> | 2019-01-25 18:42:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-25 18:42:12 +0000 |
| commit | e41489a9a116de33bd629e73a6ad393ea7d80043 (patch) | |
| tree | b2bfe834897ffef5e5e008848826da9ebaf4a01c /rootdir/Android.mk | |
| parent | 4830ba0fd1eb7f94465d15ba05cab2d6a1a91e0e (diff) | |
| parent | 48a92d715d828cba992382b4e66476be62a343b9 (diff) | |
| download | system_core-e41489a9a116de33bd629e73a6ad393ea7d80043.tar.gz system_core-e41489a9a116de33bd629e73a6ad393ea7d80043.tar.bz2 system_core-e41489a9a116de33bd629e73a6ad393ea7d80043.zip | |
Merge "Move APEX symlink creation to alternative module"
Diffstat (limited to 'rootdir/Android.mk')
| -rw-r--r-- | rootdir/Android.mk | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 1871ca78c..5a6f41b5f 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -24,6 +24,26 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init +# Start of runtime APEX compatibility. +# +# Meta-comment: +# The placing of this section is somewhat arbitrary. The LOCAL_POST_INSTALL_CMD +# entries need to be associated with something that goes into /system. +# init-debug.rc qualifies but it could be anything else in /system until soong +# supports creation of symlinks. http://b/123333111 +# +# Keeping the appearance of files/dirs having old locations for apps that have +# come to rely on them. + +# http://b/121248172 - create a link from /system/usr/icu to +# /apex/com.android.runtime/etc/icu so that apps can find the ICU .dat file. +# A symlink can't overwrite a directory and the /system/usr/icu directory once +# existed so the required structure must be created whatever we find. +LOCAL_POST_INSTALL_CMD = mkdir -p $(TARGET_OUT)/usr && rm -rf $(TARGET_OUT)/usr/icu +LOCAL_POST_INSTALL_CMD += ; ln -sf /apex/com.android.runtime/etc/icu $(TARGET_OUT)/usr/icu + +# End of runtime APEX compatibilty. + include $(BUILD_PREBUILT) ####################################### @@ -129,19 +149,6 @@ LOCAL_POST_INSTALL_CMD += ; ln -sf /vendor/odm/overlay $(TARGET_ROOT_OUT)/odm/ov LOCAL_POST_INSTALL_CMD += ; ln -sf /vendor/odm/priv-app $(TARGET_ROOT_OUT)/odm/priv-app LOCAL_POST_INSTALL_CMD += ; ln -sf /vendor/odm/usr $(TARGET_ROOT_OUT)/odm/usr -# Start of runtime APEX compatibility. -# Keeping the appearance of files/dirs having old locations for apps that have -# come to rely on them. - -# http://b/121248172 - create a link from /system/usr/icu to -# /apex/com.android.runtime/etc/icu so that apps can find the ICU .dat file. -# A symlink can't overwrite a directory and the /system/usr/icu directory once -# existed so the required structure must be created whatever we find. -LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_OUT)/usr && rm -rf $(TARGET_OUT)/usr/icu -LOCAL_POST_INSTALL_CMD += ; ln -sf /apex/com.android.runtime/etc/icu $(TARGET_OUT)/usr/icu - -# End of runtime APEX compatibilty. - ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache else |