Bug 1445524 - Always embed ICU data directly into the library, not storing it in a separate file in the file system. r=ted, a=jcristau
authorJeff Walden <jwalden@mit.edu>
Mon, 19 Mar 2018 20:33:48 -0700
changeset 460362 a315114363461db1035fde0f8ed4e201bd6fcd77
parent 460361 0bea88fd85ba1b5a306b9b0df5a57b13e0726a19
child 460363 a641151295d6b00b1d78c242ec37d362c6648758
push id8921
push userryanvm@gmail.com
push dateMon, 26 Mar 2018 14:40:36 +0000
treeherdermozilla-beta@a15c367a272e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, jcristau
bugs1445524
milestone60.0
Bug 1445524 - Always embed ICU data directly into the library, not storing it in a separate file in the file system. r=ted, a=jcristau
CLOBBER
build/autoconf/icu.m4
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Merge day clobber
+Historically updating ICU has required a CLOBBER.  Bug 1445524 is a fairly notable ICU-related change, so play it safe and force a full rebuild, even if no problem along these lines has actually been observed.
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -75,26 +75,17 @@ if test -n "$USE_ICU"; then
     fi
     MOZ_ICU_VERSION="$version"
 
     # 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.
-    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 -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
-        MOZ_ICU_DATA_ARCHIVE=1
-    else
-        MOZ_ICU_DATA_ARCHIVE=
-    fi
+    MOZ_ICU_DATA_ARCHIVE=
 fi
 
 AC_SUBST(MOZ_ICU_VERSION)
 AC_SUBST(ENABLE_INTL_API)
 AC_SUBST(USE_ICU)
 AC_SUBST(ICU_DATA_FILE)
 AC_SUBST(MOZ_ICU_DATA_ARCHIVE)