diff --git a/android_webview/java/strings/android_webview_strings.grd b/android_webview/java/strings/android_webview_strings.grd
index d3d3af1a047fdc..779ad49bbcaa77 100644
--- a/android_webview/java/strings/android_webview_strings.grd
+++ b/android_webview/java/strings/android_webview_strings.grd
@@ -78,7 +78,6 @@
-
diff --git a/android_webview/ui/aw_strings.grd b/android_webview/ui/aw_strings.grd
index ec5f93e11597f7..2b5e969aacb864 100644
--- a/android_webview/ui/aw_strings.grd
+++ b/android_webview/ui/aw_strings.grd
@@ -83,7 +83,6 @@
-
diff --git a/build/android/gyp/compile_resources.py b/build/android/gyp/compile_resources.py
index f353fd6e01472a..cf2b4db5183000 100755
--- a/build/android/gyp/compile_resources.py
+++ b/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)
diff --git a/build/config/locales.gni b/build/config/locales.gni
index 44875e780974e9..bd57fc395cb3bc 100644
--- a/build/config/locales.gni
+++ b/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
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index a821df0dfa9eec..6e3a2771fae7e2 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/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
}
}
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 29bcd544100839..d7e3dcebf4754e 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,7 +79,6 @@
-
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 2e83b39b820142..9f93d160e6a4ee 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,7 +79,6 @@
-
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 1f246c4ccf739b..068fef65dbcc21 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,7 +79,6 @@
-
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 ac07a9c3454284..2f60ecf7f3246c 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,7 +79,6 @@
-
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 51c46984e37a19..d84dbe6d0cbf24 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,7 +79,6 @@
-
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 07f8f8bc98c432..9c64837d07f2ca 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,7 +79,6 @@
-
diff --git a/chrome/android/webapk/strings/android_webapk_strings.grd b/chrome/android/webapk/strings/android_webapk_strings.grd
index 97be784f36bc3f..1e69d960ad8d4f 100644
--- a/chrome/android/webapk/strings/android_webapk_strings.grd
+++ b/chrome/android/webapk/strings/android_webapk_strings.grd
@@ -78,7 +78,6 @@
-
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index cac26b1dcc5610..0b1b278fd4c525 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -34,7 +34,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
-
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e29422ea491880..5fe8566f71d124 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -39,7 +39,6 @@ are declared in tools/grit/grit_rule.gni.
-
@@ -179,7 +178,6 @@ are declared in tools/grit/grit_rule.gni.
-
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 61a6a3d524aaa3..40e42a7605c1b3 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -36,7 +36,6 @@ chromium_strings.grd. -->
-
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index a988f9f1c2bc41..5c6c1bf8da6fb7 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -30,7 +30,6 @@
-
diff --git a/chrome/app/resources/locale_settings_linux.grd b/chrome/app/resources/locale_settings_linux.grd
index b9fb7e731cf6fd..c02b58384e3d89 100644
--- a/chrome/app/resources/locale_settings_linux.grd
+++ b/chrome/app/resources/locale_settings_linux.grd
@@ -30,7 +30,6 @@
-
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 2314678684ff93..bb9ef9ee96bef1 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,7 +82,6 @@
-
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 0e6d89499a279b..c7380d3cde1b74 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -109,7 +109,6 @@ CHAR-LIMIT guidelines:
-
diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni
index 429cce78066ce2..1cf5f4d3ccde92 100644
--- a/chromecast/chromecast.gni
+++ b/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() {
diff --git a/components/app_modal/android/app_modal_android_strings.grd b/components/app_modal/android/app_modal_android_strings.grd
index 9c36e345d0aca3..f0a145e7af94d6 100644
--- a/components/app_modal/android/app_modal_android_strings.grd
+++ b/components/app_modal/android/app_modal_android_strings.grd
@@ -80,7 +80,6 @@
-
diff --git a/components/autofill/android/java/strings/autofill_strings.grd b/components/autofill/android/java/strings/autofill_strings.grd
index 81c315a38b1329..1c65758fa2c34a 100644
--- a/components/autofill/android/java/strings/autofill_strings.grd
+++ b/components/autofill/android/java/strings/autofill_strings.grd
@@ -80,7 +80,6 @@
-
diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
index 83cfe5c1847041..320a8d529ade5a 100644
--- a/components/browser_ui/strings/android/browser_ui_strings.grd
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
@@ -80,7 +80,6 @@
-
diff --git a/components/components_chromium_strings.grd b/components/components_chromium_strings.grd
index f0f81b72ed7506..b5d1b5ceaa5ab6 100644
--- a/components/components_chromium_strings.grd
+++ b/components/components_chromium_strings.grd
@@ -32,7 +32,6 @@
-
diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd
index 42a7ae1f0a4c13..7ba36ff54143e5 100644
--- a/components/components_google_chrome_strings.grd
+++ b/components/components_google_chrome_strings.grd
@@ -32,7 +32,6 @@
-
diff --git a/components/components_locale_settings.grd b/components/components_locale_settings.grd
index 89cb92d8337553..7755f21c92724c 100644
--- a/components/components_locale_settings.grd
+++ b/components/components_locale_settings.grd
@@ -30,7 +30,6 @@
-
@@ -182,7 +181,6 @@
-
diff --git a/components/components_strings.grd b/components/components_strings.grd
index 7afdded9665511..d0c3ce604abc95 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -32,7 +32,6 @@
-
@@ -184,7 +183,6 @@
-
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 a8d57d897a576b..2bb9fc9a449672 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,7 +80,6 @@
-
diff --git a/components/omnibox/resources/omnibox_resources.grd b/components/omnibox/resources/omnibox_resources.grd
index 23cade8f459067..fdc106112d4129 100644
--- a/components/omnibox/resources/omnibox_resources.grd
+++ b/components/omnibox/resources/omnibox_resources.grd
@@ -34,7 +34,6 @@
-
diff --git a/content/public/android/java/strings/android_content_strings.grd b/content/public/android/java/strings/android_content_strings.grd
index b32f421fc3d560..88fbfe8bf93944 100644
--- a/content/public/android/java/strings/android_content_strings.grd
+++ b/content/public/android/java/strings/android_content_strings.grd
@@ -78,7 +78,6 @@
-
diff --git a/device/bluetooth/bluetooth_strings.grd b/device/bluetooth/bluetooth_strings.grd
index c237ca85ff0f17..b795cac0740549 100644
--- a/device/bluetooth/bluetooth_strings.grd
+++ b/device/bluetooth/bluetooth_strings.grd
@@ -36,7 +36,6 @@ This file contains the strings for bluetooth.
-
diff --git a/device/fido/fido_strings.grd b/device/fido/fido_strings.grd
index b479fb4eb5c9c1..672ef90eab50cb 100644
--- a/device/fido/fido_strings.grd
+++ b/device/fido/fido_strings.grd
@@ -36,7 +36,6 @@ This file contains the strings for //device/fido.
-
diff --git a/services/services_strings.grd b/services/services_strings.grd
index a5f64b72a795da..645008df4681e7 100644
--- a/services/services_strings.grd
+++ b/services/services_strings.grd
@@ -36,7 +36,6 @@ This file contains strings for code in //services.
-
diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/blink/public/strings/blink_strings.grd
index 0e80bcee47f3c4..f4b4ef35c025b3 100644
--- a/third_party/blink/public/strings/blink_strings.grd
+++ b/third_party/blink/public/strings/blink_strings.grd
@@ -72,7 +72,6 @@ below:
-
diff --git a/third_party/libaddressinput/chromium/address_input_strings.grd b/third_party/libaddressinput/chromium/address_input_strings.grd
index 86d4a94f755033..69a66cd64270bd 100644
--- a/third_party/libaddressinput/chromium/address_input_strings.grd
+++ b/third_party/libaddressinput/chromium/address_input_strings.grd
@@ -49,7 +49,6 @@ third_party/libaddressinput/BUILD.gn.
-
diff --git a/ui/strings/app_locale_settings.grd b/ui/strings/app_locale_settings.grd
index c07b66b53afa98..a62426e9ff1be5 100644
--- a/ui/strings/app_locale_settings.grd
+++ b/ui/strings/app_locale_settings.grd
@@ -30,7 +30,6 @@
-
diff --git a/ui/strings/ui_strings.grd b/ui/strings/ui_strings.grd
index 2ce4a260b34517..3e8001303add57 100644
--- a/ui/strings/ui_strings.grd
+++ b/ui/strings/ui_strings.grd
@@ -42,7 +42,6 @@ need to be translated for each locale.-->
-