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

Commit 7ea6c169 authored by Victor Chang's avatar Victor Chang
Browse files

Move ICU .dat 

Move the symlink destination of /system/usr/icu from Runtime APEX to
i18n APEX

Bug: 137009149
Test: Device boots
Change-Id: I86ff83a28d4124892d2b5d84ff09bc539f76c941
parent c9ec9527

rootdir/Android.mk

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

# 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.

# 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 = 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.

# TODO(b/124106384): Clean up compat symlinks for ART binaries.

ART_BINARIES := \

ART_BINARIES := \

rootdir/init.environ.rc.in

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ on early-init 
    export ANDROID_DATA /data

    export ANDROID_DATA /data

    export ANDROID_STORAGE /storage

    export ANDROID_STORAGE /storage

    export ANDROID_RUNTIME_ROOT /apex/com.android.runtime

    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 ANDROID_TZDATA_ROOT /apex/com.android.tzdata

    export EXTERNAL_STORAGE /sdcard

    export EXTERNAL_STORAGE /sdcard

    export ASEC_MOUNTPOINT /mnt/asec

    export ASEC_MOUNTPOINT /mnt/asec