Revert of Deduplicate Monochrome locale .paks

chrome/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/jni_generator/jni_exception_list.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
@@ skipping 23 matching lines @@
 
 chrome_sync_shell_jinja_variables =
     default_chrome_public_jinja_variables +
     [ "manifest_package=org.chromium.chrome.sync_shell" ]
 
 app_hooks_impl = "java/src/org/chromium/chrome/browser/AppHooksImpl.java"
 
 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") {
   input = "java/AndroidManifest.xml"
   output = chrome_public_android_manifest
   variables = chrome_public_jinja_variables
   variables += [
     "min_sdk_version=16",
     "target_sdk_version=23",
   ]
@@ skipping 670 matching lines @@
         _fat_lib_toolchain = android_secondary_abi_toolchain
       }
       deps = [
         ":monochrome($_fat_lib_toolchain)",
       ]
 
       input = get_label_info(deps[0], "root_out_dir") +
               "/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"
 
     additional_extra_paks = [ "$root_gen_dir/android_webview/aw_resources.pak" ]
     deps = [
       "//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.
   android_assets("monochrome_pak_assets") {
     sources = [
       "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
       "$target_gen_dir/monochrome_paks/resources.pak",
     ]
     disable_compression = true
 
     deps = [
-      ":monochrome_locale_pak_assets",
+      ":chrome_public_locale_pak_assets",
       ":monochrome_paks",
       "//android_webview:locale_pak_assets",
     ]
   }
 }  # current_toolchain == host_toolchain
 
 #
 # Only 32-bit //chrome/android/monochrome is needed, beside
 # being built with 32-bit default toolchain, it is also built
 # with secondary 32-bit toolchain in 64-bit platform because we
@@ skipping 258 matching lines @@
     "//components/sync:test_support_proto_java",
     "//components/sync/android:sync_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//ui/android:ui_java",
   ]
   proguard_enabled = !is_java_debug
 }