Bug 1262102 - Don't use MOZ_ICU_DATA_ARCHIVE=1 on Android. r=ted
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 29 Jul 2016 12:03:29 +0900
changeset 332323 a467d989a3b9e1809f42985cdd23bc4ea93db9ad
parent 332322 09874746f3e0ef2a2566e6ae5916456fed84841a
child 332324 e7e76c9521024792f6d9b430913bdaff3cb11254
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1262102
milestone50.0a1
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
build/autoconf/icu.m4
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -80,17 +80,17 @@ if test -n "$USE_ICU"; then
     # 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.
     dnl We also don't do it on Windows because sometimes the file goes
     dnl missing -- possibly due to overzealous antivirus software? --
     dnl which prevents the browser from starting up :(
-    if test -z "$JS_STANDALONE" -a -z "$MOZ_SYSTEM_ICU" -a "$OS_TARGET" != WINNT; then
+    if test -z "$JS_STANDALONE" -a -z "$MOZ_SYSTEM_ICU" -a "$OS_TARGET" != WINNT -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)