Bug 1262102 - Don't use MOZ_ICU_DATA_ARCHIVE=1 on Android. r?ted
The files into APK isn't extracted on our Android build, so it isn' good to use data file on Android build.
MozReview-Commit-ID: 4AQb2b7ScAH
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -78,17 +78,17 @@ if test -n "$USE_ICU"; then
# TODO: the l is actually endian-dependent
# We could make this set as 'l' or 'b' for little or big, respectively,
# but we'd need to check in a big-endian version of the file.
ICU_DATA_FILE="icudt${version}l.dat"
dnl We won't build ICU data as a separate file when building
dnl JS standalone so that embedders don't have to deal with it.
- if test -z "$JS_STANDALONE" -a -z "$MOZ_SYSTEM_ICU"; then
+ if test -z "$JS_STANDALONE" -a -z "$MOZ_SYSTEM_ICU" -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
MOZ_ICU_DATA_ARCHIVE=1
else
MOZ_ICU_DATA_ARCHIVE=
fi
fi
AC_SUBST(MOZ_ICU_VERSION)
AC_SUBST(ENABLE_INTL_API)