refactor locales.gni add android resource locales

This CL adds the list android_bundle_locales_as_resources which formats
all locales for .xml resource outputs.  It then uses this new list in
all the android output list in all build targets that used have .xml
outputs.

In addition the following two .grd files were missing .xml outputs for
the most recently added locales on Android. And these were updated.

  - chrome/android/features/keyboard_accessory/internal/java/strings/
  	android_keyboard_accessory_strings.grd
  - chrome/browser/touch_to_fill/android/internal/java/strings/
  	android_touch_to_fill_strings.grd

No new locales were added to apk bundles.

Bug: 812837
Change-Id: Ib9587def0aceb6894b27a8b3dc39ce920c768377
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940949
Commit-Queue: Trevor  Perrier <perrier@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721054}

android_webview/BUILD.gn

@@ -784,59 +784,8 @@ grit("generate_components_strings") {
 
 java_strings_grd("strings_grd") {
   grd_file = "java/strings/android_webview_strings.grd"
-  outputs = [
-    "values-am/android_webview_strings.xml",
-    "values-ar/android_webview_strings.xml",
-    "values-bg/android_webview_strings.xml",
-    "values-bn/android_webview_strings.xml",
-    "values-ca/android_webview_strings.xml",
-    "values-cs/android_webview_strings.xml",
-    "values-da/android_webview_strings.xml",
-    "values-de/android_webview_strings.xml",
-    "values-el/android_webview_strings.xml",
-    "values-en-rGB/android_webview_strings.xml",
-    "values-es/android_webview_strings.xml",
-    "values-es-rUS/android_webview_strings.xml",
-    "values-et/android_webview_strings.xml",
-    "values-fa/android_webview_strings.xml",
-    "values-fi/android_webview_strings.xml",
-    "values-fr/android_webview_strings.xml",
-    "values-gu/android_webview_strings.xml",
-    "values-hi/android_webview_strings.xml",
-    "values-hr/android_webview_strings.xml",
-    "values-hu/android_webview_strings.xml",
-    "values-in/android_webview_strings.xml",
-    "values-it/android_webview_strings.xml",
-    "values-iw/android_webview_strings.xml",
-    "values-ja/android_webview_strings.xml",
-    "values-kn/android_webview_strings.xml",
-    "values-ko/android_webview_strings.xml",
-    "values-lt/android_webview_strings.xml",
-    "values-lv/android_webview_strings.xml",
-    "values-ml/android_webview_strings.xml",
-    "values-mr/android_webview_strings.xml",
-    "values-ms/android_webview_strings.xml",
-    "values-nb/android_webview_strings.xml",
-    "values-nl/android_webview_strings.xml",
-    "values-pl/android_webview_strings.xml",
-    "values-pt-rBR/android_webview_strings.xml",
-    "values-pt-rPT/android_webview_strings.xml",
-    "values-ro/android_webview_strings.xml",
-    "values-ru/android_webview_strings.xml",
-    "values-sk/android_webview_strings.xml",
-    "values-sl/android_webview_strings.xml",
-    "values-sr/android_webview_strings.xml",
-    "values-sv/android_webview_strings.xml",
-    "values-sw/android_webview_strings.xml",
-    "values-ta/android_webview_strings.xml",
-    "values-te/android_webview_strings.xml",
-    "values-th/android_webview_strings.xml",
-    "values-tl/android_webview_strings.xml",
-    "values-tr/android_webview_strings.xml",
-    "values-uk/android_webview_strings.xml",
-    "values-vi/android_webview_strings.xml",
-    "values-zh-rCN/android_webview_strings.xml",
-    "values-zh-rTW/android_webview_strings.xml",
-    "values/android_webview_strings.xml",
-  ]
+  outputs = [ "values/android_webview_strings.xml" ] +
+            process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_webview_strings.xml" ])
 }

build/android/gyp/util/resource_utils.py

@@ -61,7 +61,8 @@ MULTIPLE_RES_MAGIC_STRING = b'magic'
 
 
 def ToAndroidLocaleName(chromium_locale):
-  """Convert an Chromium locale name into a corresponding Android one."""
+  """Convert a Chromium locale name into a corresponding Android one."""
+  # Should be in sync with build/config/locales.gni.
   # First handle the special cases, these are needed to deal with Android
   # releases *before* 5.0/Lollipop.
   android_locale = _CHROME_TO_ANDROID_LOCALE_MAP.get(chromium_locale)

build/config/locales.gni

@@ -78,7 +78,7 @@ all_chrome_locales = [
   "eu",
   "fa",
   "fi",
-  "fil",
+  "fil",  # "tl" in .xml but "fil" in TC and .pak
   "fr",
   "fr-CA",
   "gl",
@@ -179,6 +179,31 @@ if (is_android) {
   android_non_bundle_locales =
       all_chrome_locales - android_only_chrome_locales -
       android_chrome_omitted_locales
+
+  # List for Android locale names in .xml exports. Note: needs to stay in sync
+  # with |ToAndroidLocaleName| in build/android/gyp/util/resource_utils.py.
+  #  - add r: (e.g. zh-HK -> zh-rHK )
+  android_bundle_locales_as_resources = []
+  foreach(_locale, locales) {
+    android_bundle_locales_as_resources +=
+        [ string_replace(_locale, "-", "-r") ]
+  }
+
+  #  - remove en-US
+  #  - swap: (he, id, en-419, fil) -> (iw, in, es-rUS, tl)
+  android_bundle_locales_as_resources -= [
+    "en-rUS",
+    "es-r419",
+    "fil",
+    "he",
+    "id",
+  ]
+  android_bundle_locales_as_resources += [
+    "es-rUS",
+    "in",
+    "iw",
+    "tl",
+  ]
 } else {
   # Change if other platforms support more locales
   locales = all_chrome_locales - android_only_chrome_locales

chrome/android/features/autofill_assistant/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 
 # The animated_poodle_java target is overridden downstream and used
@@ -279,59 +280,7 @@ android_resources("java_resources") {
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_chrome_autofill_assistant_strings.grd"
-  outputs = [
-    "values/android_chrome_autofill_assistant_strings.xml",
-    "values-am/android_chrome_autofill_assistant_strings.xml",
-    "values-ar/android_chrome_autofill_assistant_strings.xml",
-    "values-bg/android_chrome_autofill_assistant_strings.xml",
-    "values-bn/android_chrome_autofill_assistant_strings.xml",
-    "values-ca/android_chrome_autofill_assistant_strings.xml",
-    "values-cs/android_chrome_autofill_assistant_strings.xml",
-    "values-da/android_chrome_autofill_assistant_strings.xml",
-    "values-de/android_chrome_autofill_assistant_strings.xml",
-    "values-el/android_chrome_autofill_assistant_strings.xml",
-    "values-en-rGB/android_chrome_autofill_assistant_strings.xml",
-    "values-es/android_chrome_autofill_assistant_strings.xml",
-    "values-es-rUS/android_chrome_autofill_assistant_strings.xml",
-    "values-et/android_chrome_autofill_assistant_strings.xml",
-    "values-fa/android_chrome_autofill_assistant_strings.xml",
-    "values-fi/android_chrome_autofill_assistant_strings.xml",
-    "values-fr/android_chrome_autofill_assistant_strings.xml",
-    "values-gu/android_chrome_autofill_assistant_strings.xml",
-    "values-hi/android_chrome_autofill_assistant_strings.xml",
-    "values-hr/android_chrome_autofill_assistant_strings.xml",
-    "values-hu/android_chrome_autofill_assistant_strings.xml",
-    "values-in/android_chrome_autofill_assistant_strings.xml",
-    "values-it/android_chrome_autofill_assistant_strings.xml",
-    "values-iw/android_chrome_autofill_assistant_strings.xml",
-    "values-ja/android_chrome_autofill_assistant_strings.xml",
-    "values-kn/android_chrome_autofill_assistant_strings.xml",
-    "values-ko/android_chrome_autofill_assistant_strings.xml",
-    "values-lt/android_chrome_autofill_assistant_strings.xml",
-    "values-lv/android_chrome_autofill_assistant_strings.xml",
-    "values-ml/android_chrome_autofill_assistant_strings.xml",
-    "values-mr/android_chrome_autofill_assistant_strings.xml",
-    "values-ms/android_chrome_autofill_assistant_strings.xml",
-    "values-nb/android_chrome_autofill_assistant_strings.xml",
-    "values-nl/android_chrome_autofill_assistant_strings.xml",
-    "values-pl/android_chrome_autofill_assistant_strings.xml",
-    "values-pt-rBR/android_chrome_autofill_assistant_strings.xml",
-    "values-pt-rPT/android_chrome_autofill_assistant_strings.xml",
-    "values-ro/android_chrome_autofill_assistant_strings.xml",
-    "values-ru/android_chrome_autofill_assistant_strings.xml",
-    "values-sk/android_chrome_autofill_assistant_strings.xml",
-    "values-sl/android_chrome_autofill_assistant_strings.xml",
-    "values-sr/android_chrome_autofill_assistant_strings.xml",
-    "values-sv/android_chrome_autofill_assistant_strings.xml",
-    "values-sw/android_chrome_autofill_assistant_strings.xml",
-    "values-ta/android_chrome_autofill_assistant_strings.xml",
-    "values-te/android_chrome_autofill_assistant_strings.xml",
-    "values-th/android_chrome_autofill_assistant_strings.xml",
-    "values-tl/android_chrome_autofill_assistant_strings.xml",
-    "values-tr/android_chrome_autofill_assistant_strings.xml",
-    "values-uk/android_chrome_autofill_assistant_strings.xml",
-    "values-vi/android_chrome_autofill_assistant_strings.xml",
-    "values-zh-rCN/android_chrome_autofill_assistant_strings.xml",
-    "values-zh-rTW/android_chrome_autofill_assistant_strings.xml",
-  ]
+  outputs = [ "values/android_chrome_autofill_assistant_strings.xml" ] + process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_chrome_autofill_assistant_strings.xml" ])
 }

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 
 android_library("internal_java") {
@@ -95,50 +96,7 @@ android_resources("java_resources") {
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_keyboard_accessory_strings.grd"
-  outputs = [
-    "values-am/android_keyboard_accessory_strings.xml",
-    "values-ar/android_keyboard_accessory_strings.xml",
-    "values-bg/android_keyboard_accessory_strings.xml",
-    "values-ca/android_keyboard_accessory_strings.xml",
-    "values-cs/android_keyboard_accessory_strings.xml",
-    "values-da/android_keyboard_accessory_strings.xml",
-    "values-de/android_keyboard_accessory_strings.xml",
-    "values-el/android_keyboard_accessory_strings.xml",
-    "values/android_keyboard_accessory_strings.xml",
-    "values-en-rGB/android_keyboard_accessory_strings.xml",
-    "values-es/android_keyboard_accessory_strings.xml",
-    "values-es-rUS/android_keyboard_accessory_strings.xml",
-    "values-fa/android_keyboard_accessory_strings.xml",
-    "values-fi/android_keyboard_accessory_strings.xml",
-    "values-tl/android_keyboard_accessory_strings.xml",
-    "values-fr/android_keyboard_accessory_strings.xml",
-    "values-hi/android_keyboard_accessory_strings.xml",
-    "values-hr/android_keyboard_accessory_strings.xml",
-    "values-hu/android_keyboard_accessory_strings.xml",
-    "values-in/android_keyboard_accessory_strings.xml",
-    "values-it/android_keyboard_accessory_strings.xml",
-    "values-iw/android_keyboard_accessory_strings.xml",
-    "values-ja/android_keyboard_accessory_strings.xml",
-    "values-ko/android_keyboard_accessory_strings.xml",
-    "values-lt/android_keyboard_accessory_strings.xml",
-    "values-lv/android_keyboard_accessory_strings.xml",
-    "values-nl/android_keyboard_accessory_strings.xml",
-    "values-nb/android_keyboard_accessory_strings.xml",
-    "values-pl/android_keyboard_accessory_strings.xml",
-    "values-pt-rBR/android_keyboard_accessory_strings.xml",
-    "values-pt-rPT/android_keyboard_accessory_strings.xml",
-    "values-ro/android_keyboard_accessory_strings.xml",
-    "values-ru/android_keyboard_accessory_strings.xml",
-    "values-sk/android_keyboard_accessory_strings.xml",
-    "values-sl/android_keyboard_accessory_strings.xml",
-    "values-sr/android_keyboard_accessory_strings.xml",
-    "values-sv/android_keyboard_accessory_strings.xml",
-    "values-sw/android_keyboard_accessory_strings.xml",
-    "values-th/android_keyboard_accessory_strings.xml",
-    "values-tr/android_keyboard_accessory_strings.xml",
-    "values-uk/android_keyboard_accessory_strings.xml",
-    "values-vi/android_keyboard_accessory_strings.xml",
-    "values-zh-rCN/android_keyboard_accessory_strings.xml",
-    "values-zh-rTW/android_keyboard_accessory_strings.xml",
-  ]
+  outputs = [ "values/android_keyboard_accessory_strings.xml" ] + process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_keyboard_accessory_strings.xml" ])
 }

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

@@ -5,6 +5,7 @@
     <output filename="values-am/android_keyboard_accessory_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_keyboard_accessory_strings.xml" lang="ar" type="android" />
     <output filename="values-bg/android_keyboard_accessory_strings.xml" lang="bg" type="android" />
+    <output filename="values-bn/android_keyboard_accessory_strings.xml" lang="bn" type="android" />
     <output filename="values-ca/android_keyboard_accessory_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_keyboard_accessory_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_keyboard_accessory_strings.xml" lang="da" type="android" />
@@ -14,10 +15,12 @@
     <output filename="values-en-rGB/android_keyboard_accessory_strings.xml" lang="en-GB" type="android" />
     <output filename="values-es/android_keyboard_accessory_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_keyboard_accessory_strings.xml" lang="es-419" type="android" />
+    <output filename="values-et/android_keyboard_accessory_strings.xml" lang="et" type="android" />
     <output filename="values-fa/android_keyboard_accessory_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_keyboard_accessory_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_keyboard_accessory_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_keyboard_accessory_strings.xml" lang="fr" type="android" />
+    <output filename="values-gu/android_keyboard_accessory_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_keyboard_accessory_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_keyboard_accessory_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_keyboard_accessory_strings.xml" lang="hu" type="android" />
@@ -25,9 +28,13 @@
     <output filename="values-it/android_keyboard_accessory_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_keyboard_accessory_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_keyboard_accessory_strings.xml" lang="ja" type="android" />
+    <output filename="values-kn/android_keyboard_accessory_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_keyboard_accessory_strings.xml" lang="ko" type="android" />
     <output filename="values-lt/android_keyboard_accessory_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_keyboard_accessory_strings.xml" lang="lv" type="android" />
+    <output filename="values-ml/android_keyboard_accessory_strings.xml" lang="ml" type="android" />
+    <output filename="values-mr/android_keyboard_accessory_strings.xml" lang="mr" type="android" />
+    <output filename="values-ms/android_keyboard_accessory_strings.xml" lang="ms" type="android" />
     <output filename="values-nl/android_keyboard_accessory_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_keyboard_accessory_strings.xml" lang="no" type="android" />
     <output filename="values-pl/android_keyboard_accessory_strings.xml" lang="pl" type="android" />
@@ -40,6 +47,8 @@
     <output filename="values-sr/android_keyboard_accessory_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_keyboard_accessory_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_keyboard_accessory_strings.xml" lang="sw" type="android" />
+    <output filename="values-ta/android_keyboard_accessory_strings.xml" lang="ta" type="android" />
+    <output filename="values-te/android_keyboard_accessory_strings.xml" lang="te" type="android" />
     <output filename="values-th/android_keyboard_accessory_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_keyboard_accessory_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_keyboard_accessory_strings.xml" lang="uk" type="android" />

chrome/android/features/media_router/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 
 android_library("java") {
@@ -139,59 +140,7 @@ android_resources("java_resources") {
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_chrome_media_router_strings.grd"
-  outputs = [
-    "values/android_chrome_media_router_strings.xml",
-    "values-am/android_chrome_media_router_strings.xml",
-    "values-ar/android_chrome_media_router_strings.xml",
-    "values-bg/android_chrome_media_router_strings.xml",
-    "values-bn/android_chrome_media_router_strings.xml",
-    "values-ca/android_chrome_media_router_strings.xml",
-    "values-cs/android_chrome_media_router_strings.xml",
-    "values-da/android_chrome_media_router_strings.xml",
-    "values-de/android_chrome_media_router_strings.xml",
-    "values-el/android_chrome_media_router_strings.xml",
-    "values-en-rGB/android_chrome_media_router_strings.xml",
-    "values-es/android_chrome_media_router_strings.xml",
-    "values-es-rUS/android_chrome_media_router_strings.xml",
-    "values-et/android_chrome_media_router_strings.xml",
-    "values-fa/android_chrome_media_router_strings.xml",
-    "values-fi/android_chrome_media_router_strings.xml",
-    "values-fr/android_chrome_media_router_strings.xml",
-    "values-gu/android_chrome_media_router_strings.xml",
-    "values-hi/android_chrome_media_router_strings.xml",
-    "values-hr/android_chrome_media_router_strings.xml",
-    "values-hu/android_chrome_media_router_strings.xml",
-    "values-in/android_chrome_media_router_strings.xml",
-    "values-it/android_chrome_media_router_strings.xml",
-    "values-iw/android_chrome_media_router_strings.xml",
-    "values-ja/android_chrome_media_router_strings.xml",
-    "values-kn/android_chrome_media_router_strings.xml",
-    "values-ko/android_chrome_media_router_strings.xml",
-    "values-lt/android_chrome_media_router_strings.xml",
-    "values-lv/android_chrome_media_router_strings.xml",
-    "values-ml/android_chrome_media_router_strings.xml",
-    "values-mr/android_chrome_media_router_strings.xml",
-    "values-ms/android_chrome_media_router_strings.xml",
-    "values-nb/android_chrome_media_router_strings.xml",
-    "values-nl/android_chrome_media_router_strings.xml",
-    "values-pl/android_chrome_media_router_strings.xml",
-    "values-pt-rBR/android_chrome_media_router_strings.xml",
-    "values-pt-rPT/android_chrome_media_router_strings.xml",
-    "values-ro/android_chrome_media_router_strings.xml",
-    "values-ru/android_chrome_media_router_strings.xml",
-    "values-sk/android_chrome_media_router_strings.xml",
-    "values-sl/android_chrome_media_router_strings.xml",
-    "values-sr/android_chrome_media_router_strings.xml",
-    "values-sv/android_chrome_media_router_strings.xml",
-    "values-sw/android_chrome_media_router_strings.xml",
-    "values-ta/android_chrome_media_router_strings.xml",
-    "values-te/android_chrome_media_router_strings.xml",
-    "values-th/android_chrome_media_router_strings.xml",
-    "values-tl/android_chrome_media_router_strings.xml",
-    "values-tr/android_chrome_media_router_strings.xml",
-    "values-uk/android_chrome_media_router_strings.xml",
-    "values-vi/android_chrome_media_router_strings.xml",
-    "values-zh-rCN/android_chrome_media_router_strings.xml",
-    "values-zh-rTW/android_chrome_media_router_strings.xml",
-  ]
+  outputs = [ "values/android_chrome_media_router_strings.xml" ] + process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_chrome_media_router_strings.xml" ])
 }

chrome/android/features/start_surface/internal/BUILD.gn

@@ -3,67 +3,16 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//components/feed/features.gni")
 
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_chrome_start_surface_strings.grd"
-  outputs = [
-    "values/android_chrome_start_surface_strings.xml",
-    "values-am/android_chrome_start_surface_strings.xml",
-    "values-ar/android_chrome_start_surface_strings.xml",
-    "values-bg/android_chrome_start_surface_strings.xml",
-    "values-bn/android_chrome_start_surface_strings.xml",
-    "values-ca/android_chrome_start_surface_strings.xml",
-    "values-cs/android_chrome_start_surface_strings.xml",
-    "values-da/android_chrome_start_surface_strings.xml",
-    "values-de/android_chrome_start_surface_strings.xml",
-    "values-el/android_chrome_start_surface_strings.xml",
-    "values-en-rGB/android_chrome_start_surface_strings.xml",
-    "values-es/android_chrome_start_surface_strings.xml",
-    "values-es-rUS/android_chrome_start_surface_strings.xml",
-    "values-et/android_chrome_start_surface_strings.xml",
-    "values-fa/android_chrome_start_surface_strings.xml",
-    "values-fi/android_chrome_start_surface_strings.xml",
-    "values-fr/android_chrome_start_surface_strings.xml",
-    "values-gu/android_chrome_start_surface_strings.xml",
-    "values-hi/android_chrome_start_surface_strings.xml",
-    "values-hr/android_chrome_start_surface_strings.xml",
-    "values-hu/android_chrome_start_surface_strings.xml",
-    "values-in/android_chrome_start_surface_strings.xml",
-    "values-it/android_chrome_start_surface_strings.xml",
-    "values-iw/android_chrome_start_surface_strings.xml",
-    "values-ja/android_chrome_start_surface_strings.xml",
-    "values-kn/android_chrome_start_surface_strings.xml",
-    "values-ko/android_chrome_start_surface_strings.xml",
-    "values-lt/android_chrome_start_surface_strings.xml",
-    "values-lv/android_chrome_start_surface_strings.xml",
-    "values-ml/android_chrome_start_surface_strings.xml",
-    "values-mr/android_chrome_start_surface_strings.xml",
-    "values-ms/android_chrome_start_surface_strings.xml",
-    "values-nb/android_chrome_start_surface_strings.xml",
-    "values-nl/android_chrome_start_surface_strings.xml",
-    "values-pl/android_chrome_start_surface_strings.xml",
-    "values-pt-rBR/android_chrome_start_surface_strings.xml",
-    "values-pt-rPT/android_chrome_start_surface_strings.xml",
-    "values-ro/android_chrome_start_surface_strings.xml",
-    "values-ru/android_chrome_start_surface_strings.xml",
-    "values-sk/android_chrome_start_surface_strings.xml",
-    "values-sl/android_chrome_start_surface_strings.xml",
-    "values-sr/android_chrome_start_surface_strings.xml",
-    "values-sv/android_chrome_start_surface_strings.xml",
-    "values-sw/android_chrome_start_surface_strings.xml",
-    "values-ta/android_chrome_start_surface_strings.xml",
-    "values-te/android_chrome_start_surface_strings.xml",
-    "values-th/android_chrome_start_surface_strings.xml",
-    "values-tl/android_chrome_start_surface_strings.xml",
-    "values-tr/android_chrome_start_surface_strings.xml",
-    "values-uk/android_chrome_start_surface_strings.xml",
-    "values-vi/android_chrome_start_surface_strings.xml",
-    "values-zh-rCN/android_chrome_start_surface_strings.xml",
-    "values-zh-rTW/android_chrome_start_surface_strings.xml",
-  ]
+  outputs = [ "values/android_chrome_start_surface_strings.xml" ] + process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_chrome_start_surface_strings.xml" ])
 }
 
 android_resources("java_resources") {

chrome/android/features/tab_ui/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/android/features/tab_ui/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//components/module_installer/android/module_desc_java.gni")
@@ -10,61 +11,11 @@ import("//components/module_installer/android/module_desc_java.gni")
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_chrome_tab_ui_strings.grd"
-  outputs = [
-    "values/android_chrome_tab_ui_strings.xml",
-    "values-am/android_chrome_tab_ui_strings.xml",
-    "values-ar/android_chrome_tab_ui_strings.xml",
-    "values-bg/android_chrome_tab_ui_strings.xml",
-    "values-bn/android_chrome_tab_ui_strings.xml",
-    "values-ca/android_chrome_tab_ui_strings.xml",
-    "values-cs/android_chrome_tab_ui_strings.xml",
-    "values-da/android_chrome_tab_ui_strings.xml",
-    "values-de/android_chrome_tab_ui_strings.xml",
-    "values-el/android_chrome_tab_ui_strings.xml",
-    "values-en-rGB/android_chrome_tab_ui_strings.xml",
-    "values-es/android_chrome_tab_ui_strings.xml",
-    "values-es-rUS/android_chrome_tab_ui_strings.xml",
-    "values-et/android_chrome_tab_ui_strings.xml",
-    "values-fa/android_chrome_tab_ui_strings.xml",
-    "values-fi/android_chrome_tab_ui_strings.xml",
-    "values-fr/android_chrome_tab_ui_strings.xml",
-    "values-gu/android_chrome_tab_ui_strings.xml",
-    "values-hi/android_chrome_tab_ui_strings.xml",
-    "values-hr/android_chrome_tab_ui_strings.xml",
-    "values-hu/android_chrome_tab_ui_strings.xml",
-    "values-in/android_chrome_tab_ui_strings.xml",
-    "values-it/android_chrome_tab_ui_strings.xml",
-    "values-iw/android_chrome_tab_ui_strings.xml",
-    "values-ja/android_chrome_tab_ui_strings.xml",
-    "values-kn/android_chrome_tab_ui_strings.xml",
-    "values-ko/android_chrome_tab_ui_strings.xml",
-    "values-lt/android_chrome_tab_ui_strings.xml",
-    "values-lv/android_chrome_tab_ui_strings.xml",
-    "values-ml/android_chrome_tab_ui_strings.xml",
-    "values-mr/android_chrome_tab_ui_strings.xml",
-    "values-ms/android_chrome_tab_ui_strings.xml",
-    "values-nb/android_chrome_tab_ui_strings.xml",
-    "values-nl/android_chrome_tab_ui_strings.xml",
-    "values-pl/android_chrome_tab_ui_strings.xml",
-    "values-pt-rBR/android_chrome_tab_ui_strings.xml",
-    "values-pt-rPT/android_chrome_tab_ui_strings.xml",
-    "values-ro/android_chrome_tab_ui_strings.xml",
-    "values-ru/android_chrome_tab_ui_strings.xml",
-    "values-sk/android_chrome_tab_ui_strings.xml",
-    "values-sl/android_chrome_tab_ui_strings.xml",
-    "values-sr/android_chrome_tab_ui_strings.xml",
-    "values-sv/android_chrome_tab_ui_strings.xml",
-    "values-sw/android_chrome_tab_ui_strings.xml",
-    "values-ta/android_chrome_tab_ui_strings.xml",
-    "values-te/android_chrome_tab_ui_strings.xml",
-    "values-th/android_chrome_tab_ui_strings.xml",
-    "values-tl/android_chrome_tab_ui_strings.xml",
-    "values-tr/android_chrome_tab_ui_strings.xml",
-    "values-uk/android_chrome_tab_ui_strings.xml",
-    "values-vi/android_chrome_tab_ui_strings.xml",
-    "values-zh-rCN/android_chrome_tab_ui_strings.xml",
-    "values-zh-rTW/android_chrome_tab_ui_strings.xml",
-  ]
+  outputs =
+      [ "values/android_chrome_tab_ui_strings.xml" ] +
+      process_file_template(
+          android_bundle_locales_as_resources,
+          [ "values-{{source_name_part}}/android_chrome_tab_ui_strings.xml" ])
 }
 
 android_resources("java_resources") {

chrome/android/features/vr/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//device/vr/buildflags/buildflags.gni")
 
@@ -11,61 +12,10 @@ assert(enable_vr)
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_chrome_vr_strings.grd"
-  outputs = [
-    "values/android_chrome_vr_strings.xml",
-    "values-am/android_chrome_vr_strings.xml",
-    "values-ar/android_chrome_vr_strings.xml",
-    "values-bg/android_chrome_vr_strings.xml",
-    "values-bn/android_chrome_vr_strings.xml",
-    "values-ca/android_chrome_vr_strings.xml",
-    "values-cs/android_chrome_vr_strings.xml",
-    "values-da/android_chrome_vr_strings.xml",
-    "values-de/android_chrome_vr_strings.xml",
-    "values-el/android_chrome_vr_strings.xml",
-    "values-en-rGB/android_chrome_vr_strings.xml",
-    "values-es/android_chrome_vr_strings.xml",
-    "values-es-rUS/android_chrome_vr_strings.xml",
-    "values-et/android_chrome_vr_strings.xml",
-    "values-fa/android_chrome_vr_strings.xml",
-    "values-fi/android_chrome_vr_strings.xml",
-    "values-fr/android_chrome_vr_strings.xml",
-    "values-gu/android_chrome_vr_strings.xml",
-    "values-hi/android_chrome_vr_strings.xml",
-    "values-hr/android_chrome_vr_strings.xml",
-    "values-hu/android_chrome_vr_strings.xml",
-    "values-in/android_chrome_vr_strings.xml",
-    "values-it/android_chrome_vr_strings.xml",
-    "values-iw/android_chrome_vr_strings.xml",
-    "values-ja/android_chrome_vr_strings.xml",
-    "values-kn/android_chrome_vr_strings.xml",
-    "values-ko/android_chrome_vr_strings.xml",
-    "values-lt/android_chrome_vr_strings.xml",
-    "values-lv/android_chrome_vr_strings.xml",
-    "values-ml/android_chrome_vr_strings.xml",
-    "values-mr/android_chrome_vr_strings.xml",
-    "values-ms/android_chrome_vr_strings.xml",
-    "values-nb/android_chrome_vr_strings.xml",
-    "values-nl/android_chrome_vr_strings.xml",
-    "values-pl/android_chrome_vr_strings.xml",
-    "values-pt-rBR/android_chrome_vr_strings.xml",
-    "values-pt-rPT/android_chrome_vr_strings.xml",
-    "values-ro/android_chrome_vr_strings.xml",
-    "values-ru/android_chrome_vr_strings.xml",
-    "values-sk/android_chrome_vr_strings.xml",
-    "values-sl/android_chrome_vr_strings.xml",
-    "values-sr/android_chrome_vr_strings.xml",
-    "values-sv/android_chrome_vr_strings.xml",
-    "values-sw/android_chrome_vr_strings.xml",
-    "values-ta/android_chrome_vr_strings.xml",
-    "values-te/android_chrome_vr_strings.xml",
-    "values-th/android_chrome_vr_strings.xml",
-    "values-tl/android_chrome_vr_strings.xml",
-    "values-tr/android_chrome_vr_strings.xml",
-    "values-uk/android_chrome_vr_strings.xml",
-    "values-vi/android_chrome_vr_strings.xml",
-    "values-zh-rCN/android_chrome_vr_strings.xml",
-    "values-zh-rTW/android_chrome_vr_strings.xml",
-  ]
+  outputs = [ "values/android_chrome_vr_strings.xml" ] +
+            process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_chrome_vr_strings.xml" ])
 }
 
 android_resources("java_resources") {

chrome/android/webapk/shell_apk/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("current_version/current_version.gni")
 import("generate_manifest_for_upload_outputs.gni")
 import("mustache_pass.gni")
@@ -201,61 +202,10 @@ template("webapk_tmpl") {
 java_strings_grd("webapk_strings_grd") {
   grd_file = "//chrome/android/webapk/strings/android_webapk_strings.grd"
 
-  outputs = [
-    "values/android_webapk_strings.xml",
-    "values-am/android_webapk_strings.xml",
-    "values-ar/android_webapk_strings.xml",
-    "values-bg/android_webapk_strings.xml",
-    "values-bn/android_webapk_strings.xml",
-    "values-ca/android_webapk_strings.xml",
-    "values-cs/android_webapk_strings.xml",
-    "values-da/android_webapk_strings.xml",
-    "values-de/android_webapk_strings.xml",
-    "values-el/android_webapk_strings.xml",
-    "values-en-rGB/android_webapk_strings.xml",
-    "values-es/android_webapk_strings.xml",
-    "values-es-rUS/android_webapk_strings.xml",
-    "values-et/android_webapk_strings.xml",
-    "values-fa/android_webapk_strings.xml",
-    "values-fi/android_webapk_strings.xml",
-    "values-fr/android_webapk_strings.xml",
-    "values-gu/android_webapk_strings.xml",
-    "values-hi/android_webapk_strings.xml",
-    "values-hr/android_webapk_strings.xml",
-    "values-hu/android_webapk_strings.xml",
-    "values-in/android_webapk_strings.xml",
-    "values-it/android_webapk_strings.xml",
-    "values-iw/android_webapk_strings.xml",
-    "values-ja/android_webapk_strings.xml",
-    "values-kn/android_webapk_strings.xml",
-    "values-ko/android_webapk_strings.xml",
-    "values-lt/android_webapk_strings.xml",
-    "values-lv/android_webapk_strings.xml",
-    "values-ml/android_webapk_strings.xml",
-    "values-mr/android_webapk_strings.xml",
-    "values-ms/android_webapk_strings.xml",
-    "values-nb/android_webapk_strings.xml",
-    "values-nl/android_webapk_strings.xml",
-    "values-pl/android_webapk_strings.xml",
-    "values-pt-rBR/android_webapk_strings.xml",
-    "values-pt-rPT/android_webapk_strings.xml",
-    "values-ro/android_webapk_strings.xml",
-    "values-ru/android_webapk_strings.xml",
-    "values-sk/android_webapk_strings.xml",
-    "values-sl/android_webapk_strings.xml",
-    "values-sr/android_webapk_strings.xml",
-    "values-sv/android_webapk_strings.xml",
-    "values-sw/android_webapk_strings.xml",
-    "values-ta/android_webapk_strings.xml",
-    "values-te/android_webapk_strings.xml",
-    "values-th/android_webapk_strings.xml",
-    "values-tl/android_webapk_strings.xml",
-    "values-tr/android_webapk_strings.xml",
-    "values-uk/android_webapk_strings.xml",
-    "values-vi/android_webapk_strings.xml",
-    "values-zh-rCN/android_webapk_strings.xml",
-    "values-zh-rTW/android_webapk_strings.xml",
-  ]
+  outputs = [ "values/android_webapk_strings.xml" ] +
+            process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_webapk_strings.xml" ])
 }
 
 # Template for WebAPK. When a WebAPK is generated:

chrome/app/BUILD.gn

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//components/gwp_asan/buildflags/buildflags.gni")
@@ -62,61 +63,11 @@ source_set("chrome_dll_resources") {
 
 if (is_android) {
   import("//build/config/android/rules.gni")
-  android_generated_java_resources = [
-    "java/res/values-am/generated_resources.xml",
-    "java/res/values-ar/generated_resources.xml",
-    "java/res/values-bg/generated_resources.xml",
-    "java/res/values-bn/generated_resources.xml",
-    "java/res/values-ca/generated_resources.xml",
-    "java/res/values-cs/generated_resources.xml",
-    "java/res/values-da/generated_resources.xml",
-    "java/res/values-de/generated_resources.xml",
-    "java/res/values-el/generated_resources.xml",
-    "java/res/values-en-rGB/generated_resources.xml",
-    "java/res/values-es/generated_resources.xml",
-    "java/res/values-es-rUS/generated_resources.xml",
-    "java/res/values-et/generated_resources.xml",
-    "java/res/values-fa/generated_resources.xml",
-    "java/res/values-fi/generated_resources.xml",
-    "java/res/values-fr/generated_resources.xml",
-    "java/res/values-gu/generated_resources.xml",
-    "java/res/values-hi/generated_resources.xml",
-    "java/res/values-hr/generated_resources.xml",
-    "java/res/values-hu/generated_resources.xml",
-    "java/res/values-in/generated_resources.xml",
-    "java/res/values-it/generated_resources.xml",
-    "java/res/values-iw/generated_resources.xml",
-    "java/res/values-ja/generated_resources.xml",
-    "java/res/values-kn/generated_resources.xml",
-    "java/res/values-ko/generated_resources.xml",
-    "java/res/values-lt/generated_resources.xml",
-    "java/res/values-lv/generated_resources.xml",
-    "java/res/values-ml/generated_resources.xml",
-    "java/res/values-mr/generated_resources.xml",
-    "java/res/values-ms/generated_resources.xml",
-    "java/res/values-nb/generated_resources.xml",
-    "java/res/values-nl/generated_resources.xml",
-    "java/res/values-pl/generated_resources.xml",
-    "java/res/values-pt-rBR/generated_resources.xml",
-    "java/res/values-pt-rPT/generated_resources.xml",
-    "java/res/values-ro/generated_resources.xml",
-    "java/res/values-ru/generated_resources.xml",
-    "java/res/values-sk/generated_resources.xml",
-    "java/res/values-sl/generated_resources.xml",
-    "java/res/values-sr/generated_resources.xml",
-    "java/res/values-sv/generated_resources.xml",
-    "java/res/values-sw/generated_resources.xml",
-    "java/res/values-ta/generated_resources.xml",
-    "java/res/values-te/generated_resources.xml",
-    "java/res/values-th/generated_resources.xml",
-    "java/res/values-tl/generated_resources.xml",
-    "java/res/values-tr/generated_resources.xml",
-    "java/res/values-uk/generated_resources.xml",
-    "java/res/values-vi/generated_resources.xml",
-    "java/res/values-zh-rCN/generated_resources.xml",
-    "java/res/values-zh-rTW/generated_resources.xml",
-    "java/res/values/generated_resources.xml",
-  ]
+  android_generated_java_resources =
+      [ "java/res/values/generated_resources.xml" ] +
+      process_file_template(
+          android_bundle_locales_as_resources,
+          [ "java/res/values-{{source_name_part}}/generated_resources.xml" ])
 }
 
 grit("generated_resources") {

chrome/browser/touch_to_fill/android/internal/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 
 android_library("java") {
@@ -44,50 +45,9 @@ android_resources("java_resources") {
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_touch_to_fill_strings.grd"
-  outputs = [
-    "values-am/android_touch_to_fill_strings.xml",
-    "values-ar/android_touch_to_fill_strings.xml",
-    "values-bg/android_touch_to_fill_strings.xml",
-    "values-ca/android_touch_to_fill_strings.xml",
-    "values-cs/android_touch_to_fill_strings.xml",
-    "values-da/android_touch_to_fill_strings.xml",
-    "values-de/android_touch_to_fill_strings.xml",
-    "values-el/android_touch_to_fill_strings.xml",
-    "values/android_touch_to_fill_strings.xml",
-    "values-en-rGB/android_touch_to_fill_strings.xml",
-    "values-es/android_touch_to_fill_strings.xml",
-    "values-es-rUS/android_touch_to_fill_strings.xml",
-    "values-fa/android_touch_to_fill_strings.xml",
-    "values-fi/android_touch_to_fill_strings.xml",
-    "values-tl/android_touch_to_fill_strings.xml",
-    "values-fr/android_touch_to_fill_strings.xml",
-    "values-hi/android_touch_to_fill_strings.xml",
-    "values-hr/android_touch_to_fill_strings.xml",
-    "values-hu/android_touch_to_fill_strings.xml",
-    "values-in/android_touch_to_fill_strings.xml",
-    "values-it/android_touch_to_fill_strings.xml",
-    "values-iw/android_touch_to_fill_strings.xml",
-    "values-ja/android_touch_to_fill_strings.xml",
-    "values-ko/android_touch_to_fill_strings.xml",
-    "values-lt/android_touch_to_fill_strings.xml",
-    "values-lv/android_touch_to_fill_strings.xml",
-    "values-nl/android_touch_to_fill_strings.xml",
-    "values-nb/android_touch_to_fill_strings.xml",
-    "values-pl/android_touch_to_fill_strings.xml",
-    "values-pt-rBR/android_touch_to_fill_strings.xml",
-    "values-pt-rPT/android_touch_to_fill_strings.xml",
-    "values-ro/android_touch_to_fill_strings.xml",
-    "values-ru/android_touch_to_fill_strings.xml",
-    "values-sk/android_touch_to_fill_strings.xml",
-    "values-sl/android_touch_to_fill_strings.xml",
-    "values-sr/android_touch_to_fill_strings.xml",
-    "values-sv/android_touch_to_fill_strings.xml",
-    "values-sw/android_touch_to_fill_strings.xml",
-    "values-th/android_touch_to_fill_strings.xml",
-    "values-tr/android_touch_to_fill_strings.xml",
-    "values-uk/android_touch_to_fill_strings.xml",
-    "values-vi/android_touch_to_fill_strings.xml",
-    "values-zh-rCN/android_touch_to_fill_strings.xml",
-    "values-zh-rTW/android_touch_to_fill_strings.xml",
-  ]
+  outputs =
+      [ "values/android_touch_to_fill_strings.xml" ] +
+      process_file_template(
+          android_bundle_locales_as_resources,
+          [ "values-{{source_name_part}}/android_touch_to_fill_strings.xml" ])
 }

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

@@ -8,6 +8,7 @@
     <output filename="values-am/android_touch_to_fill_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_touch_to_fill_strings.xml" lang="ar" type="android" />
     <output filename="values-bg/android_touch_to_fill_strings.xml" lang="bg" type="android" />
+    <output filename="values-bn/android_touch_to_fill_strings.xml" lang="bn" type="android" />
     <output filename="values-ca/android_touch_to_fill_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_touch_to_fill_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_touch_to_fill_strings.xml" lang="da" type="android" />
@@ -17,10 +18,12 @@
     <output filename="values-en-rGB/android_touch_to_fill_strings.xml" lang="en-GB" type="android" />
     <output filename="values-es/android_touch_to_fill_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_touch_to_fill_strings.xml" lang="es-419" type="android" />
+    <output filename="values-et/android_touch_to_fill_strings.xml" lang="et" type="android" />
     <output filename="values-fa/android_touch_to_fill_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_touch_to_fill_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_touch_to_fill_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_touch_to_fill_strings.xml" lang="fr" type="android" />
+    <output filename="values-gu/android_touch_to_fill_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_touch_to_fill_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_touch_to_fill_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_touch_to_fill_strings.xml" lang="hu" type="android" />
@@ -28,9 +31,13 @@
     <output filename="values-it/android_touch_to_fill_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_touch_to_fill_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_touch_to_fill_strings.xml" lang="ja" type="android" />
+    <output filename="values-kn/android_touch_to_fill_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_touch_to_fill_strings.xml" lang="ko" type="android" />
     <output filename="values-lt/android_touch_to_fill_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_touch_to_fill_strings.xml" lang="lv" type="android" />
+    <output filename="values-ml/android_touch_to_fill_strings.xml" lang="ml" type="android" />
+    <output filename="values-mr/android_touch_to_fill_strings.xml" lang="mr" type="android" />
+    <output filename="values-ms/android_touch_to_fill_strings.xml" lang="ms" type="android" />
     <output filename="values-nl/android_touch_to_fill_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_touch_to_fill_strings.xml" lang="no" type="android" />
     <output filename="values-pl/android_touch_to_fill_strings.xml" lang="pl" type="android" />
@@ -43,6 +50,8 @@
     <output filename="values-sr/android_touch_to_fill_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_touch_to_fill_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_touch_to_fill_strings.xml" lang="sw" type="android" />
+    <output filename="values-ta/android_touch_to_fill_strings.xml" lang="ta" type="android" />
+    <output filename="values-te/android_touch_to_fill_strings.xml" lang="te" type="android" />
     <output filename="values-th/android_touch_to_fill_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_touch_to_fill_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_touch_to_fill_strings.xml" lang="uk" type="android" />

chrome/browser/ui/android/strings/BUILD.gn

@@ -3,64 +3,14 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 
 java_strings_grd("ui_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "android_chrome_strings.grd"
-  outputs = [
-    "values/android_chrome_strings.xml",
-    "values-am/android_chrome_strings.xml",
-    "values-ar/android_chrome_strings.xml",
-    "values-bg/android_chrome_strings.xml",
-    "values-bn/android_chrome_strings.xml",
-    "values-ca/android_chrome_strings.xml",
-    "values-cs/android_chrome_strings.xml",
-    "values-da/android_chrome_strings.xml",
-    "values-de/android_chrome_strings.xml",
-    "values-el/android_chrome_strings.xml",
-    "values-en-rGB/android_chrome_strings.xml",
-    "values-es/android_chrome_strings.xml",
-    "values-es-rUS/android_chrome_strings.xml",
-    "values-et/android_chrome_strings.xml",
-    "values-fa/android_chrome_strings.xml",
-    "values-fi/android_chrome_strings.xml",
-    "values-fr/android_chrome_strings.xml",
-    "values-gu/android_chrome_strings.xml",
-    "values-hi/android_chrome_strings.xml",
-    "values-hr/android_chrome_strings.xml",
-    "values-hu/android_chrome_strings.xml",
-    "values-in/android_chrome_strings.xml",
-    "values-it/android_chrome_strings.xml",
-    "values-iw/android_chrome_strings.xml",
-    "values-ja/android_chrome_strings.xml",
-    "values-kn/android_chrome_strings.xml",
-    "values-ko/android_chrome_strings.xml",
-    "values-lt/android_chrome_strings.xml",
-    "values-lv/android_chrome_strings.xml",
-    "values-ml/android_chrome_strings.xml",
-    "values-mr/android_chrome_strings.xml",
-    "values-ms/android_chrome_strings.xml",
-    "values-nb/android_chrome_strings.xml",
-    "values-nl/android_chrome_strings.xml",
-    "values-pl/android_chrome_strings.xml",
-    "values-pt-rBR/android_chrome_strings.xml",
-    "values-pt-rPT/android_chrome_strings.xml",
-    "values-ro/android_chrome_strings.xml",
-    "values-ru/android_chrome_strings.xml",
-    "values-sk/android_chrome_strings.xml",
-    "values-sl/android_chrome_strings.xml",
-    "values-sr/android_chrome_strings.xml",
-    "values-sv/android_chrome_strings.xml",
-    "values-sw/android_chrome_strings.xml",
-    "values-ta/android_chrome_strings.xml",
-    "values-te/android_chrome_strings.xml",
-    "values-th/android_chrome_strings.xml",
-    "values-tl/android_chrome_strings.xml",
-    "values-tr/android_chrome_strings.xml",
-    "values-uk/android_chrome_strings.xml",
-    "values-vi/android_chrome_strings.xml",
-    "values-zh-rCN/android_chrome_strings.xml",
-    "values-zh-rTW/android_chrome_strings.xml",
-  ]
+  outputs = [ "values/android_chrome_strings.xml" ] +
+            process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_chrome_strings.xml" ])
 }

components/autofill/android/BUILD.gn

@@ -3,64 +3,14 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 
 java_strings_grd("autofill_strings_grd") {
   grd_file = "java/strings/autofill_strings.grd"
-  outputs = [
-    "values/autofill_strings.xml",
-    "values-am/autofill_strings.xml",
-    "values-ar/autofill_strings.xml",
-    "values-bg/autofill_strings.xml",
-    "values-bn/autofill_strings.xml",
-    "values-ca/autofill_strings.xml",
-    "values-cs/autofill_strings.xml",
-    "values-da/autofill_strings.xml",
-    "values-de/autofill_strings.xml",
-    "values-el/autofill_strings.xml",
-    "values-en-rGB/autofill_strings.xml",
-    "values-es/autofill_strings.xml",
-    "values-es-rUS/autofill_strings.xml",
-    "values-et/autofill_strings.xml",
-    "values-fa/autofill_strings.xml",
-    "values-fi/autofill_strings.xml",
-    "values-fr/autofill_strings.xml",
-    "values-gu/autofill_strings.xml",
-    "values-hi/autofill_strings.xml",
-    "values-hr/autofill_strings.xml",
-    "values-hu/autofill_strings.xml",
-    "values-in/autofill_strings.xml",
-    "values-it/autofill_strings.xml",
-    "values-iw/autofill_strings.xml",
-    "values-ja/autofill_strings.xml",
-    "values-kn/autofill_strings.xml",
-    "values-ko/autofill_strings.xml",
-    "values-lt/autofill_strings.xml",
-    "values-lv/autofill_strings.xml",
-    "values-ml/autofill_strings.xml",
-    "values-mr/autofill_strings.xml",
-    "values-ms/autofill_strings.xml",
-    "values-nb/autofill_strings.xml",
-    "values-nl/autofill_strings.xml",
-    "values-pl/autofill_strings.xml",
-    "values-pt-rBR/autofill_strings.xml",
-    "values-pt-rPT/autofill_strings.xml",
-    "values-ro/autofill_strings.xml",
-    "values-ru/autofill_strings.xml",
-    "values-sk/autofill_strings.xml",
-    "values-sl/autofill_strings.xml",
-    "values-sr/autofill_strings.xml",
-    "values-sv/autofill_strings.xml",
-    "values-sw/autofill_strings.xml",
-    "values-ta/autofill_strings.xml",
-    "values-te/autofill_strings.xml",
-    "values-th/autofill_strings.xml",
-    "values-tl/autofill_strings.xml",
-    "values-tr/autofill_strings.xml",
-    "values-uk/autofill_strings.xml",
-    "values-vi/autofill_strings.xml",
-    "values-zh-rCN/autofill_strings.xml",
-    "values-zh-rTW/autofill_strings.xml",
-  ]
+  outputs = [ "values/autofill_strings.xml" ] +
+            process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/autofill_strings.xml" ])
 }
 
 android_resources("autofill_java_resources") {

components/embedder_support/android/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 
 android_library("application_java") {
   deps = [
@@ -61,61 +62,9 @@ generate_jni("view_jni_headers") {
 
 java_strings_grd("web_contents_delegate_strings_grd") {
   grd_file = "java/strings/web_contents_delegate_android_strings.grd"
-  outputs = [
-    "values/web_contents_delegate_android_strings.xml",
-    "values-am/web_contents_delegate_android_strings.xml",
-    "values-ar/web_contents_delegate_android_strings.xml",
-    "values-bg/web_contents_delegate_android_strings.xml",
-    "values-bn/web_contents_delegate_android_strings.xml",
-    "values-ca/web_contents_delegate_android_strings.xml",
-    "values-cs/web_contents_delegate_android_strings.xml",
-    "values-da/web_contents_delegate_android_strings.xml",
-    "values-de/web_contents_delegate_android_strings.xml",
-    "values-el/web_contents_delegate_android_strings.xml",
-    "values-en-rGB/web_contents_delegate_android_strings.xml",
-    "values-es/web_contents_delegate_android_strings.xml",
-    "values-es-rUS/web_contents_delegate_android_strings.xml",
-    "values-et/web_contents_delegate_android_strings.xml",
-    "values-fa/web_contents_delegate_android_strings.xml",
-    "values-fi/web_contents_delegate_android_strings.xml",
-    "values-fr/web_contents_delegate_android_strings.xml",
-    "values-gu/web_contents_delegate_android_strings.xml",
-    "values-hi/web_contents_delegate_android_strings.xml",
-    "values-hr/web_contents_delegate_android_strings.xml",
-    "values-hu/web_contents_delegate_android_strings.xml",
-    "values-in/web_contents_delegate_android_strings.xml",
-    "values-it/web_contents_delegate_android_strings.xml",
-    "values-iw/web_contents_delegate_android_strings.xml",
-    "values-ja/web_contents_delegate_android_strings.xml",
-    "values-kn/web_contents_delegate_android_strings.xml",
-    "values-ko/web_contents_delegate_android_strings.xml",
-    "values-lt/web_contents_delegate_android_strings.xml",
-    "values-lv/web_contents_delegate_android_strings.xml",
-    "values-ml/web_contents_delegate_android_strings.xml",
-    "values-mr/web_contents_delegate_android_strings.xml",
-    "values-ms/web_contents_delegate_android_strings.xml",
-    "values-nb/web_contents_delegate_android_strings.xml",
-    "values-nl/web_contents_delegate_android_strings.xml",
-    "values-pl/web_contents_delegate_android_strings.xml",
-    "values-pt-rBR/web_contents_delegate_android_strings.xml",
-    "values-pt-rPT/web_contents_delegate_android_strings.xml",
-    "values-ro/web_contents_delegate_android_strings.xml",
-    "values-ru/web_contents_delegate_android_strings.xml",
-    "values-sk/web_contents_delegate_android_strings.xml",
-    "values-sl/web_contents_delegate_android_strings.xml",
-    "values-sr/web_contents_delegate_android_strings.xml",
-    "values-sv/web_contents_delegate_android_strings.xml",
-    "values-sw/web_contents_delegate_android_strings.xml",
-    "values-ta/web_contents_delegate_android_strings.xml",
-    "values-te/web_contents_delegate_android_strings.xml",
-    "values-th/web_contents_delegate_android_strings.xml",
-    "values-tl/web_contents_delegate_android_strings.xml",
-    "values-tr/web_contents_delegate_android_strings.xml",
-    "values-uk/web_contents_delegate_android_strings.xml",
-    "values-vi/web_contents_delegate_android_strings.xml",
-    "values-zh-rCN/web_contents_delegate_android_strings.xml",
-    "values-zh-rTW/web_contents_delegate_android_strings.xml",
-  ]
+  outputs = [ "values/web_contents_delegate_android_strings.xml" ] + process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/web_contents_delegate_android_strings.xml" ])
 }
 
 static_library("web_contents_delegate") {

components/strings/BUILD.gn

@@ -9,61 +9,11 @@ import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
-  android_components_strings_java_resources = [
-    "java/res/values-am/components_strings.xml",
-    "java/res/values-ar/components_strings.xml",
-    "java/res/values-bg/components_strings.xml",
-    "java/res/values-bn/components_strings.xml",
-    "java/res/values-ca/components_strings.xml",
-    "java/res/values-cs/components_strings.xml",
-    "java/res/values-da/components_strings.xml",
-    "java/res/values-de/components_strings.xml",
-    "java/res/values-el/components_strings.xml",
-    "java/res/values-en-rGB/components_strings.xml",
-    "java/res/values-es/components_strings.xml",
-    "java/res/values-es-rUS/components_strings.xml",
-    "java/res/values-et/components_strings.xml",
-    "java/res/values-fa/components_strings.xml",
-    "java/res/values-fi/components_strings.xml",
-    "java/res/values-fr/components_strings.xml",
-    "java/res/values-gu/components_strings.xml",
-    "java/res/values-hi/components_strings.xml",
-    "java/res/values-hr/components_strings.xml",
-    "java/res/values-hu/components_strings.xml",
-    "java/res/values-in/components_strings.xml",
-    "java/res/values-it/components_strings.xml",
-    "java/res/values-iw/components_strings.xml",
-    "java/res/values-ja/components_strings.xml",
-    "java/res/values-kn/components_strings.xml",
-    "java/res/values-ko/components_strings.xml",
-    "java/res/values-lt/components_strings.xml",
-    "java/res/values-lv/components_strings.xml",
-    "java/res/values-ml/components_strings.xml",
-    "java/res/values-mr/components_strings.xml",
-    "java/res/values-ms/components_strings.xml",
-    "java/res/values-nb/components_strings.xml",
-    "java/res/values-nl/components_strings.xml",
-    "java/res/values-pl/components_strings.xml",
-    "java/res/values-pt-rBR/components_strings.xml",
-    "java/res/values-pt-rPT/components_strings.xml",
-    "java/res/values-ro/components_strings.xml",
-    "java/res/values-ru/components_strings.xml",
-    "java/res/values-sk/components_strings.xml",
-    "java/res/values-sl/components_strings.xml",
-    "java/res/values-sr/components_strings.xml",
-    "java/res/values-sv/components_strings.xml",
-    "java/res/values-sw/components_strings.xml",
-    "java/res/values-ta/components_strings.xml",
-    "java/res/values-te/components_strings.xml",
-    "java/res/values-th/components_strings.xml",
-    "java/res/values-tl/components_strings.xml",
-    "java/res/values-tr/components_strings.xml",
-    "java/res/values-uk/components_strings.xml",
-    "java/res/values-vi/components_strings.xml",
-    "java/res/values-zh-rCN/components_strings.xml",
-    "java/res/values-zh-rTW/components_strings.xml",
-    "java/res/values/components_strings.xml",
-  ]
+  android_components_strings_java_resources =
+      [ "java/res/values/components_strings.xml" ] +
+      process_file_template(
+          android_bundle_locales_as_resources,
+          [ "java/res/values-{{source_name_part}}/components_strings.xml" ])
 }
 
 group("strings") {
@@ -126,61 +76,11 @@ grit("components_google_chrome_strings") {
 }
 
 if (is_android) {
-  android_components_locale_settings_java_resources = [
-    "java/res/values-am/components_locale_settings.xml",
-    "java/res/values-ar/components_locale_settings.xml",
-    "java/res/values-bg/components_locale_settings.xml",
-    "java/res/values-bn/components_locale_settings.xml",
-    "java/res/values-ca/components_locale_settings.xml",
-    "java/res/values-cs/components_locale_settings.xml",
-    "java/res/values-da/components_locale_settings.xml",
-    "java/res/values-de/components_locale_settings.xml",
-    "java/res/values-el/components_locale_settings.xml",
-    "java/res/values-en-rGB/components_locale_settings.xml",
-    "java/res/values-es/components_locale_settings.xml",
-    "java/res/values-es-rUS/components_locale_settings.xml",
-    "java/res/values-et/components_locale_settings.xml",
-    "java/res/values-fa/components_locale_settings.xml",
-    "java/res/values-fi/components_locale_settings.xml",
-    "java/res/values-fr/components_locale_settings.xml",
-    "java/res/values-gu/components_locale_settings.xml",
-    "java/res/values-hi/components_locale_settings.xml",
-    "java/res/values-hr/components_locale_settings.xml",
-    "java/res/values-hu/components_locale_settings.xml",
-    "java/res/values-in/components_locale_settings.xml",
-    "java/res/values-it/components_locale_settings.xml",
-    "java/res/values-iw/components_locale_settings.xml",
-    "java/res/values-ja/components_locale_settings.xml",
-    "java/res/values-kn/components_locale_settings.xml",
-    "java/res/values-ko/components_locale_settings.xml",
-    "java/res/values-lt/components_locale_settings.xml",
-    "java/res/values-lv/components_locale_settings.xml",
-    "java/res/values-ml/components_locale_settings.xml",
-    "java/res/values-mr/components_locale_settings.xml",
-    "java/res/values-ms/components_locale_settings.xml",
-    "java/res/values-nb/components_locale_settings.xml",
-    "java/res/values-nl/components_locale_settings.xml",
-    "java/res/values-pl/components_locale_settings.xml",
-    "java/res/values-pt-rBR/components_locale_settings.xml",
-    "java/res/values-pt-rPT/components_locale_settings.xml",
-    "java/res/values-ro/components_locale_settings.xml",
-    "java/res/values-ru/components_locale_settings.xml",
-    "java/res/values-sk/components_locale_settings.xml",
-    "java/res/values-sl/components_locale_settings.xml",
-    "java/res/values-sr/components_locale_settings.xml",
-    "java/res/values-sv/components_locale_settings.xml",
-    "java/res/values-sw/components_locale_settings.xml",
-    "java/res/values-ta/components_locale_settings.xml",
-    "java/res/values-te/components_locale_settings.xml",
-    "java/res/values-th/components_locale_settings.xml",
-    "java/res/values-tl/components_locale_settings.xml",
-    "java/res/values-tr/components_locale_settings.xml",
-    "java/res/values-uk/components_locale_settings.xml",
-    "java/res/values-vi/components_locale_settings.xml",
-    "java/res/values-zh-rCN/components_locale_settings.xml",
-    "java/res/values-zh-rTW/components_locale_settings.xml",
-    "java/res/values/components_locale_settings.xml",
-  ]
+  android_components_locale_settings_java_resources =
+      [ "java/res/values/components_locale_settings.xml" ]
+  android_components_locale_settings_java_resources += process_file_template(
+          android_bundle_locales_as_resources,
+          [ "java/res/values-{{source_name_part}}/components_locale_settings.xml" ])
 }
 
 grit("components_locale_settings") {

content/public/android/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//device/vr/buildflags/buildflags.gni")
 
 android_aidl("common_aidl") {
@@ -303,61 +304,10 @@ android_library("content_java") {
 
 java_strings_grd("content_strings_grd") {
   grd_file = "java/strings/android_content_strings.grd"
-  outputs = [
-    "values/android_content_strings.xml",
-    "values-am/android_content_strings.xml",
-    "values-ar/android_content_strings.xml",
-    "values-bg/android_content_strings.xml",
-    "values-bn/android_content_strings.xml",
-    "values-ca/android_content_strings.xml",
-    "values-cs/android_content_strings.xml",
-    "values-da/android_content_strings.xml",
-    "values-de/android_content_strings.xml",
-    "values-el/android_content_strings.xml",
-    "values-en-rGB/android_content_strings.xml",
-    "values-es/android_content_strings.xml",
-    "values-es-rUS/android_content_strings.xml",
-    "values-et/android_content_strings.xml",
-    "values-fa/android_content_strings.xml",
-    "values-fi/android_content_strings.xml",
-    "values-fr/android_content_strings.xml",
-    "values-gu/android_content_strings.xml",
-    "values-hi/android_content_strings.xml",
-    "values-hr/android_content_strings.xml",
-    "values-hu/android_content_strings.xml",
-    "values-in/android_content_strings.xml",
-    "values-it/android_content_strings.xml",
-    "values-iw/android_content_strings.xml",
-    "values-ja/android_content_strings.xml",
-    "values-kn/android_content_strings.xml",
-    "values-ko/android_content_strings.xml",
-    "values-lt/android_content_strings.xml",
-    "values-lv/android_content_strings.xml",
-    "values-ml/android_content_strings.xml",
-    "values-mr/android_content_strings.xml",
-    "values-ms/android_content_strings.xml",
-    "values-nb/android_content_strings.xml",
-    "values-nl/android_content_strings.xml",
-    "values-pl/android_content_strings.xml",
-    "values-pt-rBR/android_content_strings.xml",
-    "values-pt-rPT/android_content_strings.xml",
-    "values-ro/android_content_strings.xml",
-    "values-ru/android_content_strings.xml",
-    "values-sk/android_content_strings.xml",
-    "values-sl/android_content_strings.xml",
-    "values-sr/android_content_strings.xml",
-    "values-sv/android_content_strings.xml",
-    "values-sw/android_content_strings.xml",
-    "values-ta/android_content_strings.xml",
-    "values-te/android_content_strings.xml",
-    "values-th/android_content_strings.xml",
-    "values-tl/android_content_strings.xml",
-    "values-tr/android_content_strings.xml",
-    "values-uk/android_content_strings.xml",
-    "values-vi/android_content_strings.xml",
-    "values-zh-rCN/android_content_strings.xml",
-    "values-zh-rTW/android_content_strings.xml",
-  ]
+  outputs = [ "values/android_content_strings.xml" ] +
+            process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_content_strings.xml" ])
 }
 
 java_cpp_enum("content_public_android_java_enums_srcjar") {

weblayer/BUILD.gn

@@ -49,65 +49,16 @@ if (is_android) {
       "-w",
       whitelist,
     ]
-    outputs = [
-      "grit/components_strings.h",
-      "java/res/values-am/components_strings.xml",
-      "java/res/values-ar/components_strings.xml",
-      "java/res/values-bg/components_strings.xml",
-      "java/res/values-bn/components_strings.xml",
-      "java/res/values-ca/components_strings.xml",
-      "java/res/values-cs/components_strings.xml",
-      "java/res/values-da/components_strings.xml",
-      "java/res/values-de/components_strings.xml",
-      "java/res/values-el/components_strings.xml",
-      "java/res/values-en-rGB/components_strings.xml",
-      "java/res/values-es/components_strings.xml",
-      "java/res/values-es-rUS/components_strings.xml",
-      "java/res/values-et/components_strings.xml",
-      "java/res/values-fa/components_strings.xml",
-      "java/res/values-fi/components_strings.xml",
-      "java/res/values-fr/components_strings.xml",
-      "java/res/values-gu/components_strings.xml",
-      "java/res/values-hi/components_strings.xml",
-      "java/res/values-hr/components_strings.xml",
-      "java/res/values-hu/components_strings.xml",
-      "java/res/values-in/components_strings.xml",
-      "java/res/values-it/components_strings.xml",
-      "java/res/values-iw/components_strings.xml",
-      "java/res/values-ja/components_strings.xml",
-      "java/res/values-kn/components_strings.xml",
-      "java/res/values-ko/components_strings.xml",
-      "java/res/values-lt/components_strings.xml",
-      "java/res/values-lv/components_strings.xml",
-      "java/res/values-ml/components_strings.xml",
-      "java/res/values-mr/components_strings.xml",
-      "java/res/values-ms/components_strings.xml",
-      "java/res/values-nb/components_strings.xml",
-      "java/res/values-nl/components_strings.xml",
-      "java/res/values-pl/components_strings.xml",
-      "java/res/values-pt-rBR/components_strings.xml",
-      "java/res/values-pt-rPT/components_strings.xml",
-      "java/res/values-ro/components_strings.xml",
-      "java/res/values-ru/components_strings.xml",
-      "java/res/values-sk/components_strings.xml",
-      "java/res/values-sl/components_strings.xml",
-      "java/res/values-sr/components_strings.xml",
-      "java/res/values-sv/components_strings.xml",
-      "java/res/values-sw/components_strings.xml",
-      "java/res/values-ta/components_strings.xml",
-      "java/res/values-te/components_strings.xml",
-      "java/res/values-th/components_strings.xml",
-      "java/res/values-tl/components_strings.xml",
-      "java/res/values-tr/components_strings.xml",
-      "java/res/values-uk/components_strings.xml",
-      "java/res/values-vi/components_strings.xml",
-      "java/res/values-zh-rCN/components_strings.xml",
-      "java/res/values-zh-rTW/components_strings.xml",
-      "java/res/values/components_strings.xml",
-    ]
-    foreach(_locale, locales_with_fake_bidi) {
-      outputs += [ "components_strings_${_locale}.pak" ]
-    }
+    outputs =
+        [
+          "grit/components_strings.h",
+          "java/res/values/components_strings.xml",
+        ] +
+        process_file_template(
+            android_bundle_locales_as_resources,
+            [ "java/res/values-{{source_name_part}}/components_strings.xml" ]) +
+        process_file_template(locales_with_fake_bidi,
+                              [ "components_strings_{{source_name_part}}.pak" ])
   }
 
   repack("weblayer_locales") {