Reland "Revert [Android] don't map zh-hk to zh-tw in bundle builds."
This reverts commit eec2c8df9e88b7142cf83c5be6146ed1c75e203f.
Reason for revert:
An exception for the zh-HK ByteOrderMarks has been added.
https://chromium-review.googlesource.com/c/chromium/src/+/2026149
Original change's description:
> Revert "[Android] don't map zh-hk to zh-tw in bundle builds."
>
> This reverts commit 43fcd55d34ca96458e15c237d015f1b596daf64a.
>
> Reason for revert:
>
> Suspecting this change caused the compile failure at https://cr-buildbucket.appspot.com/build/8889983375245058816.
>
> Original change's description:
> > [Android] don't map zh-hk to zh-tw in bundle builds.
> >
> > To give Clank language parity with Android 27 new locales are being
> > added. 26 of those locales have been added in two previous CLs:
> >
> > - https://crrev.com/c/1941058
> > - https://crrev.com/c/1952288
> >
> > zh-hk was skipped because currently resources for it are mapped to
> > zh-tw. This CL skips that mapping for bundle builds where zh-hk is
> > now included. zh-hk is still mapped to zh-tw in apk builds.
> >
> > There is an increase in size even when language splits are used in
> > bundles. A bug has been created to look into this:
> > - APK Bundles wastes a lot of space in resources.arsc (400kb)
> > - https://crbug.com/1031645
> >
> > Bug: 1034774
> > Binary-Size: Size increase is unavoidable (see above).
> > Change-Id: I4edb9d5213e8dd3443522deee5395e500af34371
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1970258
> > Reviewed-by: Yaron Friedman <[email protected]>
> > Reviewed-by: (gone) Eric Stevenson <[email protected]>
> > Commit-Queue: Trevor Perrier <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#736071}
>
> [email protected],[email protected],[email protected],[email protected],[email protected]
>
> Change-Id: I6748ad1e997bb5e2e05d6a99a52fd3e3595253fd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1034774
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026151
> Reviewed-by: Chan Li <[email protected]>
> Commit-Queue: Chan Li <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#736091}
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
Change-Id: I934feb29c7f8b032236ce2e0cc4c4c8c38de5511
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1034774
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026427
Reviewed-by: Megan Jablonski <[email protected]>
Reviewed-by: Yaron Friedman <[email protected]>
Commit-Queue: Trevor Perrier <[email protected]>
Cr-Commit-Position: refs/heads/master@{#736442}
diff --git a/components/components_strings.grd b/components/components_strings.grd
index d0c3ce60..7afdded 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -32,6 +32,7 @@
<output filename="components_strings_sq.pak" type="data_package" lang="sq" />
<output filename="components_strings_ur.pak" type="data_package" lang="ur" />
<output filename="components_strings_uz.pak" type="data_package" lang="uz" />
+ <output filename="components_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="components_strings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="components_strings_am.pak" type="data_package" lang="am" />
@@ -183,6 +184,7 @@
<output filename="java/res/values-uz/components_strings.xml" lang="uz" type="android" context="android_java" />
<output filename="java/res/values-vi/components_strings.xml" lang="vi" type="android" context="android_java" />
<output filename="java/res/values-zh-rCN/components_strings.xml" lang="zh-CN" type="android" context="android_java" />
+ <output filename="java/res/values-zh-rHK/components_strings.xml" lang="zh-HK" type="android" context="android_java" />
<output filename="java/res/values-zh-rTW/components_strings.xml" lang="zh-TW" type="android" context="android_java" />
<output filename="java/res/values-zu/components_strings.xml" lang="zu" type="android" context="android_java" />
</if>
