ICU 56 step 6: Check in the pre-built ICU data

android/patch_locale.sh

 #!/bin/sh
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 treeroot="$(dirname "$0")/.."
 cd "${treeroot}"
 
 echo "Applying brkitr.patch"
-patch -p1 < android/brkitr.patch || { echo "failed to patch" >2; exit 1; }
+patch -p1 < android/brkitr.patch || { echo "failed to patch" >&2; exit 1; }
 
 # Keep only the currencies used by the larget 60 economies in terms of GDP
 # with several more added in.
 # TODO(jshin): Use ucurr_isAvailable in ICU to drop more currencies.
 # See also http://en.wikipedia.org/wiki/List_of_circulating_currencies
 # Copied from scripts/trim_data.sh. Need to refactor.
 for currency in $(grep -v '^#' "${treeroot}/android/currencies.list")
 do
   OP=${KEEPLIST:+|}
   KEEPLIST=${KEEPLIST}${OP}${currency}
@@ skipping 58 matching lines @@
 
 echo Overwriting curr/reslocal.mk to drop the currency names
 echo for ${EXTRA_LANGUAGES}
 for lang in ${EXTRA_LANGUAGES}
 do
   sed -i -e '/'$lang'.txt/ d' curr/reslocal.mk
 done
 
 
 # Excludes region data. On Android Java API is used to get the data.
+# Due to a bug in ICU, an empty region list always uses 70kB pool.res bundle.
+# As a work around, include the minimal version of en.txt
 echo Overwriting region/reslocal.mk...
 cat >region/reslocal.mk <<END
 REGION_CLDR_VERSION = %version%
 REGION_SYNTHETIC_ALIAS =
 REGION_ALIAS_SOURCE =
-REGION_SOURCE =
+REGION_SOURCE = en.txt
+END
+
+echo Overwriting region/en.txt...
+cat >region/en.txt <<END
+en{
+    Countries{
+        US{"United States"}
+    }
+}
 END
 
 # On Android Java API is used to get lang data, except for the language and
 # script names for zh_Hans and zh_Hant which are not supported by Java API.
 # Here remove all lang data except those names.
 # See the comments in GetDisplayNameForLocale() (in Chromium's
 # src/ui/base/l10n/l10n_util.cc) about why we need the scripts.
 for i in lang/*.txt; do
   echo Overwriting $i...
   sed '/^    Keys{$/,/^    }$/d
@@ skipping 67 matching lines @@
 
   # Add 'roc' calendar to zh_Hant*.
   [[ "$(basename $i .txt)" =~ 'zh_Hant' ]] && { EXTRA_CAL="${EXTRA_CAL}|roc"; }
 
   CAL_PATTERN="(${COMMON_CALENDARS}${EXTRA_CAL:+|${EXTRA_CAL}})"
   echo $CAL_PATTERN
 
   echo Overwriting $i...
   sed -r '/^    calendar\{$/,/^    \}$/ {
             /^    calendar\{$/p
+            /^        default\{".*"\}$/p
             /^        '${CAL_PATTERN}'\{$/, /^        \}$/p
             /^    \}$/p
             d
           }' -i $i
 done
 
 echo DONE.