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/android_webview/java/strings/android_webview_strings.grd b/android_webview/java/strings/android_webview_strings.grd
index 779ad49..d3d3af1 100644
--- a/android_webview/java/strings/android_webview_strings.grd
+++ b/android_webview/java/strings/android_webview_strings.grd
@@ -78,6 +78,7 @@
<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>
diff --git a/android_webview/ui/aw_strings.grd b/android_webview/ui/aw_strings.grd
index 2b5e969a..ec5f93e 100644
--- a/android_webview/ui/aw_strings.grd
+++ b/android_webview/ui/aw_strings.grd
@@ -83,6 +83,7 @@
<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>
diff --git a/build/android/gyp/compile_resources.py b/build/android/gyp/compile_resources.py
index cf2b4db5..f353fd6 100755
--- a/build/android/gyp/compile_resources.py
+++ b/build/android/gyp/compile_resources.py
@@ -697,7 +697,8 @@
build.deps_dir)
logging.debug('Applying locale transformations')
path_info = resource_utils.ResourceInfoFile()
- _DuplicateZhResources(dep_subdirs, path_info)
+ if options.support_zh_hk:
+ _DuplicateZhResources(dep_subdirs, path_info)
_RenameLocaleResourceDirs(dep_subdirs, path_info)
_RemoveUnwantedLocalizedStrings(dep_subdirs, options)
diff --git a/build/config/locales.gni b/build/config/locales.gni
index bd57fc3..44875e7 100644
--- a/build/config/locales.gni
+++ b/build/config/locales.gni
@@ -171,9 +171,7 @@
]
if (is_android) {
- # Add all locales except "zh-HK" since this currently rendered as "zh-TW"
- # https://crbug.com/780847
- locales = all_chrome_locales - [ "zh-HK" ]
+ locales = all_chrome_locales
# Android doesn't ship all locales on KitKat in order to save space
# (but webview does). http://crbug.com/369218
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 6e3a277..a821df0d 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -204,6 +204,9 @@
# 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
}
}
diff --git a/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
index d7e3dceb..29bcd54 100644
--- a/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
+++ b/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
@@ -79,6 +79,7 @@
<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>
diff --git a/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
index 9f93d16..2e83b39 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
+++ b/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
@@ -79,6 +79,7 @@
<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>
diff --git a/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd b/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
index 068fef6..1f246c4c 100644
--- a/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
+++ b/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
@@ -79,6 +79,7 @@
<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>
diff --git a/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd b/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
index 2f60ecf7..ac07a9c 100644
--- a/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
+++ b/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
@@ -79,6 +79,7 @@
<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>
diff --git a/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index d84dbe6..51c4698 100644
--- a/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -79,6 +79,7 @@
<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>
diff --git a/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd b/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
index 9c64837..07f8f8bc 100644
--- a/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
+++ b/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
@@ -79,6 +79,7 @@
<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>
diff --git a/chrome/android/webapk/strings/android_webapk_strings.grd b/chrome/android/webapk/strings/android_webapk_strings.grd
index 1e69d960..97be784 100644
--- a/chrome/android/webapk/strings/android_webapk_strings.grd
+++ b/chrome/android/webapk/strings/android_webapk_strings.grd
@@ -78,6 +78,7 @@
<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>
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 0b1b278f..cac26b1 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -34,6 +34,7 @@
<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" />
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5fe8566..e29422ea 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -39,6 +39,7 @@
<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" />
@@ -178,6 +179,7 @@
<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>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 40e42a76..61a6a3d5 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -36,6 +36,7 @@
<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" />
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 5c6c1bf8..a988f9f1 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -30,6 +30,7 @@
<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" />
diff --git a/chrome/app/resources/locale_settings_linux.grd b/chrome/app/resources/locale_settings_linux.grd
index c02b5838..b9fb7e7 100644
--- a/chrome/app/resources/locale_settings_linux.grd
+++ b/chrome/app/resources/locale_settings_linux.grd
@@ -30,6 +30,7 @@
<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" />
diff --git a/chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd b/chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd
index bb9ef9e..23146786 100644
--- a/chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd
+++ b/chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd
@@ -82,6 +82,7 @@
<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>
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index a7ae60f6..db61cc1 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -109,6 +109,7 @@
<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>
diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni
index 1cf5f4d..429cce78 100644
--- a/chromecast/chromecast.gni
+++ b/chromecast/chromecast.gni
@@ -160,7 +160,7 @@
# 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 - [ "zh-HK" ]
+ cast_locales -= android_only_chrome_locales
}
declare_args() {
diff --git a/components/app_modal/android/app_modal_android_strings.grd b/components/app_modal/android/app_modal_android_strings.grd
index f0a145e..9c36e345 100644
--- a/components/app_modal/android/app_modal_android_strings.grd
+++ b/components/app_modal/android/app_modal_android_strings.grd
@@ -80,6 +80,7 @@
<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>
diff --git a/components/autofill/android/java/strings/autofill_strings.grd b/components/autofill/android/java/strings/autofill_strings.grd
index 1c65758..81c315a 100644
--- a/components/autofill/android/java/strings/autofill_strings.grd
+++ b/components/autofill/android/java/strings/autofill_strings.grd
@@ -80,6 +80,7 @@
<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>
diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
index 320a8d5..83cfe5c1 100644
--- a/components/browser_ui/strings/android/browser_ui_strings.grd
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
@@ -80,6 +80,7 @@
<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>
diff --git a/components/components_chromium_strings.grd b/components/components_chromium_strings.grd
index b5d1b5c..f0f81b7 100644
--- a/components/components_chromium_strings.grd
+++ b/components/components_chromium_strings.grd
@@ -32,6 +32,7 @@
<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" />
diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd
index 7ba36ff..42a7ae1 100644
--- a/components/components_google_chrome_strings.grd
+++ b/components/components_google_chrome_strings.grd
@@ -32,6 +32,7 @@
<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" />
diff --git a/components/components_locale_settings.grd b/components/components_locale_settings.grd
index 7755f21..89cb92d8 100644
--- a/components/components_locale_settings.grd
+++ b/components/components_locale_settings.grd
@@ -30,6 +30,7 @@
<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" />
@@ -181,6 +182,7 @@
<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>
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>
diff --git a/components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd b/components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd
index 2bb9fc9a..a8d57d89 100644
--- a/components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd
+++ b/components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd
@@ -80,6 +80,7 @@
<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>
diff --git a/components/omnibox/resources/omnibox_resources.grd b/components/omnibox/resources/omnibox_resources.grd
index fdc1061..23cade8f 100644
--- a/components/omnibox/resources/omnibox_resources.grd
+++ b/components/omnibox/resources/omnibox_resources.grd
@@ -34,6 +34,7 @@
<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" />
diff --git a/content/public/android/java/strings/android_content_strings.grd b/content/public/android/java/strings/android_content_strings.grd
index 88fbfe8b..b32f421 100644
--- a/content/public/android/java/strings/android_content_strings.grd
+++ b/content/public/android/java/strings/android_content_strings.grd
@@ -78,6 +78,7 @@
<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>
diff --git a/device/bluetooth/bluetooth_strings.grd b/device/bluetooth/bluetooth_strings.grd
index b795cac..c237ca8 100644
--- a/device/bluetooth/bluetooth_strings.grd
+++ b/device/bluetooth/bluetooth_strings.grd
@@ -36,6 +36,7 @@
<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" />
diff --git a/device/fido/fido_strings.grd b/device/fido/fido_strings.grd
index 672ef90..b479fb4 100644
--- a/device/fido/fido_strings.grd
+++ b/device/fido/fido_strings.grd
@@ -36,6 +36,7 @@
<output filename="fido_strings_sq.pak" type="data_package" lang="sq" />
<output filename="fido_strings_ur.pak" type="data_package" lang="ur" />
<output filename="fido_strings_uz.pak" type="data_package" lang="uz" />
+ <output filename="fido_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="fido_strings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="fido_strings_am.pak" type="data_package" lang="am" />
diff --git a/services/services_strings.grd b/services/services_strings.grd
index 645008d..a5f64b7 100644
--- a/services/services_strings.grd
+++ b/services/services_strings.grd
@@ -36,6 +36,7 @@
<output filename="services_strings_sq.pak" type="data_package" lang="sq" />
<output filename="services_strings_ur.pak" type="data_package" lang="ur" />
<output filename="services_strings_uz.pak" type="data_package" lang="uz" />
+ <output filename="services_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="services_strings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="services_strings_am.pak" type="data_package" lang="am" />
diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/blink/public/strings/blink_strings.grd
index f4b4ef35..0e80bce 100644
--- a/third_party/blink/public/strings/blink_strings.grd
+++ b/third_party/blink/public/strings/blink_strings.grd
@@ -72,6 +72,7 @@
<output filename="blink_strings_sq.pak" type="data_package" lang="sq" />
<output filename="blink_strings_ur.pak" type="data_package" lang="ur" />
<output filename="blink_strings_uz.pak" type="data_package" lang="uz" />
+ <output filename="blink_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="blink_strings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="blink_strings_am.pak" type="data_package" lang="am" />
diff --git a/third_party/libaddressinput/chromium/address_input_strings.grd b/third_party/libaddressinput/chromium/address_input_strings.grd
index 69a66cd..86d4a94f7 100644
--- a/third_party/libaddressinput/chromium/address_input_strings.grd
+++ b/third_party/libaddressinput/chromium/address_input_strings.grd
@@ -49,6 +49,7 @@
<output filename="address_input_strings_sq.pak" type="data_package" lang="sq" />
<output filename="address_input_strings_ur.pak" type="data_package" lang="ur" />
<output filename="address_input_strings_uz.pak" type="data_package" lang="uz" />
+ <output filename="address_input_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="address_input_strings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="address_input_strings_am.pak" type="data_package" lang="am" />
diff --git a/ui/strings/app_locale_settings.grd b/ui/strings/app_locale_settings.grd
index a62426e9..c07b66b 100644
--- a/ui/strings/app_locale_settings.grd
+++ b/ui/strings/app_locale_settings.grd
@@ -30,6 +30,7 @@
<output filename="app_locale_settings_sq.pak" type="data_package" lang="sq" />
<output filename="app_locale_settings_ur.pak" type="data_package" lang="ur" />
<output filename="app_locale_settings_uz.pak" type="data_package" lang="uz" />
+ <output filename="app_locale_settings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="app_locale_settings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="app_locale_settings_am.pak" type="data_package" lang="am" />
diff --git a/ui/strings/ui_strings.grd b/ui/strings/ui_strings.grd
index 3e80013..2ce4a26 100644
--- a/ui/strings/ui_strings.grd
+++ b/ui/strings/ui_strings.grd
@@ -42,6 +42,7 @@
<output filename="ui_strings_sq.pak" type="data_package" lang="sq" />
<output filename="ui_strings_ur.pak" type="data_package" lang="ur" />
<output filename="ui_strings_uz.pak" type="data_package" lang="uz" />
+ <output filename="ui_strings_zh-HK.pak" type="data_package" lang="zh-HK" />
<output filename="ui_strings_zu.pak" type="data_package" lang="zu" />
</if>
<output filename="ui_strings_am.pak" type="data_package" lang="am" />
