Revert of Separate WebView's locale paks from Chrome's 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("//android_webview/webview_repack_locales_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")
 import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
 import("//device/vr/features/features.gni")
 import("//testing/test.gni")
@@ skipping 577 matching lines @@
 android_assets("chrome_public_pak_assets") {
   sources = [
     "$root_out_dir/chrome_100_percent.pak",
     "$root_out_dir/resources.pak",
   ]
   disable_compression = true
 
   deps = [
     ":chrome_public_locale_pak_assets",
     "//chrome:packed_resources",
+    "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
+    "//third_party/icu:icu_assets",
+    "//v8:v8_external_startup_data_assets",
   ]
 }
 
 # This target is separate from chrome_public_pak_assets because it does not
 # disable compression.
 android_assets("chrome_public_locale_pak_assets") {
   sources = []
   foreach(_locale, locales - android_chrome_omitted_locales) {
     sources += [ "$root_out_dir/locales/$_locale.pak" ]
   }
@@ skipping 69 matching lines @@
       deps = [
         ":monochrome($_fat_lib_toolchain)",
       ]
 
       input = get_label_info(deps[0], "root_out_dir") +
               "/libmonochrome$shlib_extension.whitelist"
       output = monochrome_resource_whitelist
     }
   }
 
-  # 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
+    additional_locale_source_patterns = webview_repack_locales_source_patterns
+    deps += webview_repack_locales_deps
 
     if (enable_resource_whitelist_generation) {
       repack_whitelist = monochrome_resource_whitelist
       deps += [ ":monochrome_resource_whitelist" ]
     }
   }
 
-  # 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",
     ]
+    foreach(_locale, locales) {
+      sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
+    }
     disable_compression = true
 
     deps = [
-      ":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
 # need 64-bit //android_webview/monochrome and 32-bit this target
 # for 64-bit APK.
@@ skipping 228 matching lines @@
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
     "//third_party/android_support_test_runner:runner_java",
   ]
   proguard_enabled = !is_java_debug
 }