Merge "Add a symlink for the ICU .dat file" am: 792fd03955 (88d1451e) · Commits · e / os / android_system_core

rootdir/Android.mk

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -129,6 +129,19 @@ 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/priv-app $(TARGET_ROOT_OUT)/odm/priv-app
	LOCAL_POST_INSTALL_CMD += ; ln -sf /vendor/odm/usr $(TARGET_ROOT_OUT)/odm/usr		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		ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE
	LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache		LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache
	else		else