Merge "Move ICU .dat"
am: ef0bc63043
Change-Id: I263e6dd27acf9c322756bb0111873f7efe156d5c
This commit is contained in:
commit
d9153800b4
2 changed files with 2 additions and 1 deletions
|
@ -230,7 +230,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
|
|||
# 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
|
||||
LOCAL_POST_INSTALL_CMD += && ln -sf /apex/com.android.i18n/etc/icu $(TARGET_OUT)/usr/icu
|
||||
|
||||
# TODO(b/124106384): Clean up compat symlinks for ART binaries.
|
||||
ART_BINARIES := \
|
||||
|
|
|
@ -6,6 +6,7 @@ on early-init
|
|||
export ANDROID_DATA /data
|
||||
export ANDROID_STORAGE /storage
|
||||
export ANDROID_RUNTIME_ROOT /apex/com.android.runtime
|
||||
export ANDROID_I18N_ROOT /apex/com.android.i18n
|
||||
export ANDROID_TZDATA_ROOT /apex/com.android.tzdata
|
||||
export EXTERNAL_STORAGE /sdcard
|
||||
export ASEC_MOUNTPOINT /mnt/asec
|
||||
|
|
Loading…
Reference in a new issue