Bug 1349884 - Turn off ENABLE_INTL_API on Android/x86's all channel. r?snorp draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 27 Mar 2017 16:39:44 +0900
changeset 551662 4dc3ce715193f34597c332fd4ca0c8e5e6bd94f3
parent 551502 cc53710589fb500610495da5258b7b9221edf681
child 621602 52509c7e77b8e16387b27b5be4991c61bd60d95f
push id51120
push userm_kato@ga2.so-net.ne.jp
push dateMon, 27 Mar 2017 07:43:04 +0000
reviewerssnorp
bugs1349884
milestone55.0a1
Bug 1349884 - Turn off ENABLE_INTL_API on Android/x86's all channel. r?snorp Android/x86 runs xpcshell and a limited of mochitest. These tests are already passed on m-c. MozReview-Commit-ID: 7Qkqi0dYh95
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -5301,17 +5301,22 @@ dnl win32 options
 AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(WIN_UCRT_REDIST_DIR)
 
 dnl ========================================================
 dnl ICU Support
 dnl ========================================================
 
 if test "$MOZ_WIDGET_TOOLKIT" != "android" -o -z "$RELEASE_OR_BETA"; then
-    _INTL_API=yes
+    dnl Disable ICU on android/x86 for testing on tier-1 platform
+    if test "$MOZ_WIDGET_TOOLKIT" = "android" -a "$CPU_ARCH" = "x86"; then
+        _INTL_API=no
+    else
+        _INTL_API=yes
+    fi
 else
     _INTL_API=no
 fi
 
 if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
     USE_ICU=1
 fi