Separate WebView's locale paks from Chrome's locale paks

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 1a2527ee1387309919945f0f10c4abcce9802b67..343263bdd2a91507fbc0595361cb29638a8c3d34 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -2,7 +2,6 @@
 # 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")
@@ -600,9 +599,6 @@ android_assets("chrome_public_pak_assets") {
   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",

[michaelbai, 2017/05/17 20:53:18]

what's this change for?

[F, 2017/05/17 21:02:55]

This change is a passing-by code clean up, because chrome_public_non_pak_assets
already takes care of these deps and these deps are duplicates and cause
confusion for readers.

   ]
 }
 
@@ -692,6 +688,7 @@ if (current_toolchain == default_toolchain) {
     }
   }
 
+  # This target does not output locale paks.
   chrome_paks("monochrome_paks") {
     output_dir = "$target_gen_dir/$target_name"
 
@@ -700,8 +697,7 @@ if (current_toolchain == default_toolchain) {
       "//android_webview:generate_aw_resources",
     ]
 
-    additional_locale_source_patterns = webview_repack_locales_source_patterns
-    deps += webview_repack_locales_deps
+    exclude_locale_paks = true
 
     if (enable_resource_whitelist_generation) {
       repack_whitelist = monochrome_resource_whitelist
@@ -709,18 +705,18 @@ if (current_toolchain == default_toolchain) {
     }
   }
 
+  # 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