Revert "[Android] don't map zh-hk to zh-tw in bundle builds."

This reverts commit 43fcd55.

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 <yfriedman@chromium.org>
> Reviewed-by: (gone) Eric Stevenson <estevenson@chromium.org>
> Commit-Queue: Trevor  Perrier <perrier@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#736071}

TBR=yfriedman@chromium.org,tedchoc@chromium.org,agrieve@chromium.org,estevenson@chromium.org,perrier@chromium.org

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 <chanli@chromium.org>
Commit-Queue: Chan Li <chanli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736091}

android_webview/java/strings/android_webview_strings.grd

@@ -78,7 +78,6 @@
     <output filename="values-uz/android_webview_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_webview_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_webview_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_webview_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_webview_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_webview_strings.xml" lang="zu" type="android" />
   </outputs>

android_webview/ui/aw_strings.grd

@@ -83,7 +83,6 @@
     <output filename="aw_strings_uz.pak" type="data_package" lang="uz" />
     <output filename="aw_strings_vi.pak" type="data_package" lang="vi" />
     <output filename="aw_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="aw_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
     <output filename="aw_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
     <output filename="aw_strings_zu.pak" type="data_package" lang="zu" />
   </outputs>

build/android/gyp/compile_resources.py

@@ -697,8 +697,7 @@ def _PackageApk(options, build):
                                            build.deps_dir)
   logging.debug('Applying locale transformations')
   path_info = resource_utils.ResourceInfoFile()
-  if options.support_zh_hk:
-    _DuplicateZhResources(dep_subdirs, path_info)
+  _DuplicateZhResources(dep_subdirs, path_info)
   _RenameLocaleResourceDirs(dep_subdirs, path_info)
 
   _RemoveUnwantedLocalizedStrings(dep_subdirs, options)

build/config/locales.gni

@@ -171,7 +171,9 @@ android_only_chrome_locales = [
 ]
 
 if (is_android) {
-  locales = all_chrome_locales
+  # Add all locales except "zh-HK" since this currently rendered as "zh-TW"
+  # https://crbug.com/780847
+  locales = all_chrome_locales - [ "zh-HK" ]
 
   # Android doesn't ship all locales on KitKat in order to save space
   # (but webview does). http://crbug.com/369218

chrome/android/chrome_public_apk_tmpl.gni

@@ -204,9 +204,6 @@ template("chrome_public_common_apk_or_module_tmpl") {
         # For bundles, only include resource strings files from our full
         # locale list, but nothing more.
         aapt_locale_whitelist = locales
-
-        # zh_hk is supported in Android bundles.
-        support_zh_hk = false
       }
     }
 

chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd

@@ -79,7 +79,6 @@
     <output filename="values-uz/android_chrome_autofill_assistant_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_autofill_assistant_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_autofill_assistant_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_autofill_assistant_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_autofill_assistant_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_chrome_autofill_assistant_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd

@@ -79,7 +79,6 @@
     <output filename="values-uz/android_keyboard_accessory_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_keyboard_accessory_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_keyboard_accessory_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_keyboard_accessory_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_keyboard_accessory_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_keyboard_accessory_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd

@@ -79,7 +79,6 @@
     <output filename="values-uz/android_chrome_media_router_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_media_router_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_media_router_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_media_router_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_media_router_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_chrome_media_router_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd

@@ -79,7 +79,6 @@
     <output filename="values-uz/android_chrome_start_surface_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_start_surface_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_start_surface_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_start_surface_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_start_surface_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_chrome_start_surface_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd

@@ -79,7 +79,6 @@
     <output filename="values-uz/android_chrome_tab_ui_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_tab_ui_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_tab_ui_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_tab_ui_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_tab_ui_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_chrome_tab_ui_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd

@@ -79,7 +79,6 @@
     <output filename="values-uz/android_chrome_vr_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_vr_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_vr_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_vr_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_vr_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_chrome_vr_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/android/webapk/strings/android_webapk_strings.grd

@@ -78,7 +78,6 @@
     <output filename="values-uz/android_webapk_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_webapk_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_webapk_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_webapk_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_webapk_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_webapk_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/app/chromium_strings.grd

@@ -34,7 +34,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
       <output filename="chromium_strings_sq.pak" type="data_package" lang="sq" />
       <output filename="chromium_strings_ur.pak" type="data_package" lang="ur" />
       <output filename="chromium_strings_uz.pak" type="data_package" lang="uz" />
-      <output filename="chromium_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="chromium_strings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="chromium_strings_am.pak" type="data_package" lang="am" />

chrome/app/generated_resources.grd

@@ -39,7 +39,6 @@ are declared in tools/grit/grit_rule.gni.
       <output filename="generated_resources_sq.pak" type="data_package" lang="sq" />
       <output filename="generated_resources_ur.pak" type="data_package" lang="ur" />
       <output filename="generated_resources_uz.pak" type="data_package" lang="uz" />
-      <output filename="generated_resources_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="generated_resources_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="generated_resources_am.pak" type="data_package" lang="am" />
@@ -179,7 +178,6 @@ are declared in tools/grit/grit_rule.gni.
       <output filename="java/res/values-uz/generated_resources.xml" lang="uz" type="android" context="android_java" />
       <output filename="java/res/values-vi/generated_resources.xml" lang="vi" type="android" context="android_java" />
       <output filename="java/res/values-zh-rCN/generated_resources.xml" lang="zh-CN" type="android" context="android_java" />
-      <output filename="java/res/values-zh-rHK/generated_resources.xml" lang="zh-HK" type="android" context="android_java" />
       <output filename="java/res/values-zh-rTW/generated_resources.xml" lang="zh-TW" type="android" context="android_java" />
       <output filename="java/res/values-zu/generated_resources.xml" lang="zu" type="android" context="android_java" />
     </if>

chrome/app/google_chrome_strings.grd

@@ -36,7 +36,6 @@ chromium_strings.grd. -->
       <output filename="google_chrome_strings_sq.pak" type="data_package" lang="sq" />
       <output filename="google_chrome_strings_ur.pak" type="data_package" lang="ur" />
       <output filename="google_chrome_strings_uz.pak" type="data_package" lang="uz" />
-      <output filename="google_chrome_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="google_chrome_strings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="google_chrome_strings_am.pak" type="data_package" lang="am" />

chrome/app/resources/locale_settings.grd

@@ -30,7 +30,6 @@
       <output filename="locale_settings_sq.pak" type="data_package" lang="sq" />
       <output filename="locale_settings_ur.pak" type="data_package" lang="ur" />
       <output filename="locale_settings_uz.pak" type="data_package" lang="uz" />
-      <output filename="locale_settings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="locale_settings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="locale_settings_am.pak" type="data_package" lang="am" />

chrome/app/resources/locale_settings_linux.grd

@@ -30,7 +30,6 @@
       <output filename="platform_locale_settings_sq.pak" type="data_package" lang="sq" />
       <output filename="platform_locale_settings_ur.pak" type="data_package" lang="ur" />
       <output filename="platform_locale_settings_uz.pak" type="data_package" lang="uz" />
-      <output filename="platform_locale_settings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="platform_locale_settings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="platform_locale_settings_am.pak" type="data_package" lang="am" />

chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd

@@ -82,7 +82,6 @@
     <output filename="values-uz/android_touch_to_fill_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_touch_to_fill_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_touch_to_fill_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_touch_to_fill_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_touch_to_fill_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_touch_to_fill_strings.xml" lang="zu" type="android" />
   </outputs>

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -109,7 +109,6 @@ CHAR-LIMIT guidelines:
     <output filename="values-uz/android_chrome_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_chrome_strings.xml" lang="zu" type="android" />
   </outputs>

chromecast/chromecast.gni

@@ -160,7 +160,7 @@ cast_locales = locales
 # If Cast will also the android files update this and the Cast grd files.
 if (is_android) {
   # Subtract out additional Android locales
-  cast_locales -= android_only_chrome_locales
+  cast_locales -= android_only_chrome_locales - [ "zh-HK" ]
 }
 
 declare_args() {

components/app_modal/android/app_modal_android_strings.grd

@@ -80,7 +80,6 @@
     <output filename="values-uz/app_modal_android_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/app_modal_android_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/app_modal_android_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/app_modal_android_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/app_modal_android_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/app_modal_android_strings.xml" lang="zu" type="android" />
   </outputs>

components/autofill/android/java/strings/autofill_strings.grd

@@ -80,7 +80,6 @@
     <output filename="values-uz/autofill_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/autofill_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/autofill_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/autofill_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/autofill_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/autofill_strings.xml" lang="zu" type="android" />
   </outputs>

components/browser_ui/strings/android/browser_ui_strings.grd

@@ -80,7 +80,6 @@
     <output filename="values-uz/browser_ui_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/browser_ui_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/browser_ui_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/browser_ui_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/browser_ui_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/browser_ui_strings.xml" lang="zu" type="android" />
   </outputs>

components/components_chromium_strings.grd

@@ -32,7 +32,6 @@
       <output filename="components_chromium_strings_sq.pak" type="data_package" lang="sq" />
       <output filename="components_chromium_strings_ur.pak" type="data_package" lang="ur" />
       <output filename="components_chromium_strings_uz.pak" type="data_package" lang="uz" />
-      <output filename="components_chromium_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="components_chromium_strings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="components_chromium_strings_am.pak" type="data_package" lang="am" />

components/components_google_chrome_strings.grd

@@ -32,7 +32,6 @@
       <output filename="components_google_chrome_strings_sq.pak" type="data_package" lang="sq" />
       <output filename="components_google_chrome_strings_ur.pak" type="data_package" lang="ur" />
       <output filename="components_google_chrome_strings_uz.pak" type="data_package" lang="uz" />
-      <output filename="components_google_chrome_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="components_google_chrome_strings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="components_google_chrome_strings_am.pak" type="data_package" lang="am" />

components/components_locale_settings.grd

@@ -30,7 +30,6 @@
       <output filename="components_locale_settings_sq.pak" type="data_package" lang="sq" />
       <output filename="components_locale_settings_ur.pak" type="data_package" lang="ur" />
       <output filename="components_locale_settings_uz.pak" type="data_package" lang="uz" />
-      <output filename="components_locale_settings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="components_locale_settings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="components_locale_settings_am.pak" type="data_package" lang="am" />
@@ -182,7 +181,6 @@
       <output filename="java/res/values-uz/components_locale_settings.xml" lang="uz" type="android" context="android_java" />
       <output filename="java/res/values-vi/components_locale_settings.xml" lang="vi" type="android" context="android_java" />
       <output filename="java/res/values-zh-rCN/components_locale_settings.xml" lang="zh-CN" type="android" context="android_java" />
-      <output filename="java/res/values-zh-rHK/components_locale_settings.xml" lang="zh-HK" type="android" context="android_java" />
       <output filename="java/res/values-zh-rTW/components_locale_settings.xml" lang="zh-TW" type="android" context="android_java" />
       <output filename="java/res/values-zu/components_locale_settings.xml" lang="zu" type="android" context="android_java" />
     </if>

components/components_strings.grd

@@ -32,7 +32,6 @@
       <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" />
@@ -184,7 +183,6 @@
       <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>

components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd

@@ -80,7 +80,6 @@
     <output filename="values-uz/web_contents_delegate_android_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/web_contents_delegate_android_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/web_contents_delegate_android_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/web_contents_delegate_android_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/web_contents_delegate_android_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/web_contents_delegate_android_strings.xml" lang="zu" type="android" />
   </outputs>

components/omnibox/resources/omnibox_resources.grd

@@ -34,7 +34,6 @@
       <output filename="omnibox_resources_sq.pak" type="data_package" lang="sq" />
       <output filename="omnibox_resources_ur.pak" type="data_package" lang="ur" />
       <output filename="omnibox_resources_uz.pak" type="data_package" lang="uz" />
-      <output filename="omnibox_resources_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="omnibox_resources_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="omnibox_resources_am.pak" type="data_package" lang="am" />

content/public/android/java/strings/android_content_strings.grd

@@ -78,7 +78,6 @@
     <output filename="values-uz/android_content_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_content_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_content_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_content_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_content_strings.xml" lang="zh-TW" type="android" />
     <output filename="values-zu/android_content_strings.xml" lang="zu" type="android" />
   </outputs>

device/bluetooth/bluetooth_strings.grd

@@ -36,7 +36,6 @@ This file contains the strings for bluetooth.
       <output filename="bluetooth_strings_sq.pak" type="data_package" lang="sq" />
       <output filename="bluetooth_strings_ur.pak" type="data_package" lang="ur" />
       <output filename="bluetooth_strings_uz.pak" type="data_package" lang="uz" />
-      <output filename="bluetooth_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
       <output filename="bluetooth_strings_zu.pak" type="data_package" lang="zu" />
     </if>
     <output filename="bluetooth_strings_am.pak" type="data_package" lang="am" />