Revert of Deduplicate Monochrome locale .paks

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 5fbf3732a5a756fbb23cab870e0fd7d512081a13..c59688c1b72c031021c82cfa1065861178471abf 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -41,8 +41,6 @@
 if (enable_resource_whitelist_generation) {
   monochrome_resource_whitelist =
       "$target_gen_dir/monochrome_resource_whitelist.txt"
-  monochrome_locale_whitelist =
-      "$target_gen_dir/monochrome_locale_whitelist.txt"
 }
 
 jinja_template("chrome_public_android_manifest") {
@@ -733,38 +731,9 @@
               "/libmonochrome$shlib_extension.whitelist"
       output = monochrome_resource_whitelist
     }
-    
-    action("monochrome_locale_whitelist") {
-      script = "//tools/resources/filter_resource_whitelist.py"
-      
-      _system_webview_pak_whitelist =
-          "$root_gen_dir/android_webview/system_webview_pak_whitelist.txt"
-      
-      inputs = [
-        monochrome_resource_whitelist,
-        _system_webview_pak_whitelist,
-      ]
-      
-      outputs = [
-        monochrome_locale_whitelist,
-      ]
-      
-      deps = [
-        ":monochrome_resource_whitelist",
-        "//android_webview:system_webview_pak_whitelist",
-      ]
-      
-      args = [
-        "--input",
-        rebase_path(monochrome_resource_whitelist, root_build_dir),
-        "--filter",
-        rebase_path(_system_webview_pak_whitelist, root_build_dir),
-        "--output",
-        rebase_path(monochrome_locale_whitelist, root_build_dir),
-      ]
-    } 
-  }
-
+  }
+
+  # This target does not output locale paks.
   chrome_paks("monochrome_paks") {
     output_dir = "$target_gen_dir/$target_name"
 
@@ -773,25 +742,12 @@
       "//android_webview:generate_aw_resources",
     ]
 
+    exclude_locale_paks = true
+
     if (enable_resource_whitelist_generation) {
       repack_whitelist = monochrome_resource_whitelist
       deps += [ ":monochrome_resource_whitelist" ]
-      locale_whitelist = monochrome_locale_whitelist
-      deps += [ ":monochrome_locale_whitelist" ]
     }
-  }
-  
-  # This target is separate from monochrome_pak_assets because it does not
-  # disable compression.
-  android_assets("monochrome_locale_pak_assets") {
-    sources = []
-    foreach(_locale, locales - android_chrome_omitted_locales) {
-      sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
-    }
-  
-    deps = [
-      ":monochrome_paks",
-    ]
   }
 
   # This target explicitly includes locale paks via deps.
@@ -803,7 +759,7 @@
     disable_compression = true
 
     deps = [
-      ":monochrome_locale_pak_assets",
+      ":chrome_public_locale_pak_assets",
       ":monochrome_paks",
       "//android_webview:locale_pak_assets",
     ]