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

Commit 6c4a7d33 authored by vichang's avatar vichang Committed by android-build-merger
Browse files

Merge "Move ICU .dat" am: ef0bc630 am: d9153800 

am: 90954c62

Change-Id: Ie0331af8bbef316f0500d8924b91ce2929e7024d
parents 921d8096 90954c62

rootdir/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 := \

rootdir/init.environ.rc.in

+1 −0
Original line number Diff line number Diff line
@@ -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