Remove additional calendars in the ICU data

Remove additional calendars in the ICU data

Due to a bug in patch_locale.sh, calendars intended for being stripped
away are not removed from the ICU data for Android.

Fixing the bug cuts down the ICU data size by 10kB on Android.

BUG=472142
TEST=android/icudtl.dat is ~10kB smaller than before. (6,267,808 bytes)
R=mark@chromium.org

Committed: https://chromium.googlesource.com/chromium/deps/icu/+/e4c31439828d356525b71ef81a6d61ea50d7d673

[jungshik at Google, 2015-04-02 23:01:05]

jshin@chromium.org changed reviewers:
+ mark@chromium.org

[jungshik at Google, 2015-04-02 23:01:05]

Meant to do this along with the previous CL, but forgot. 
PTAL. Thanks.

[Mark Mentovai, 2015-04-03 12:51:09]

LGTM

https://codereview.chromium.org/1052333003/diff/1/android/patch_locale.sh
File android/patch_locale.sh (right):

https://codereview.chromium.org/1052333003/diff/1/android/patch_locale.sh#new...
android/patch_locale.sh:175: CAL_PATTERN="(${COMMON_CALENDARS})"
You can write all of this in one line:

  CAL_PATTERN="${COMMON_CALENDARS}${EXTRA_CAL:+|${EXTRA_CAL}}"

${var:+text} expands to nothing if var is empty and to text if var is nonempty.

[jungshik at Google, 2015-04-03 17:10:30]

Committed patchset #2 (id:10001) manually as
e4c31439828d356525b71ef81a6d61ea50d7d673 (presubmit successful).

[jungshik at Google, 2015-04-03 17:11:01]

On 2015/04/03 12:51:09, Mark Mentovai wrote:
> LGTM
> 
> https://codereview.chromium.org/1052333003/diff/1/android/patch_locale.sh
> File android/patch_locale.sh (right):
> 
>
https://codereview.chromium.org/1052333003/diff/1/android/patch_locale.sh#new...
> android/patch_locale.sh:175: CAL_PATTERN="(${COMMON_CALENDARS})"
> You can write all of this in one line:
> 
>   CAL_PATTERN="${COMMON_CALENDARS}${EXTRA_CAL:+|${EXTRA_CAL}}"
> 
> ${var:+text} expands to nothing if var is empty and to text if var is
nonempty.

Thanks. I switched to a param expansion as suggested.