Upstream monochrome repack locales

chrome/chrome_repack_locales.gni

Index: chrome/chrome_repack_locales.gni
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index 9601dd4eb85da1c588a66f9b5954a09cafe9c2ff..0a349b3250c926cd068bbc7ae19e91750922144b 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -17,6 +17,19 @@ import("//tools/grit/repack.gni")
 #
 #   visibility
 #       Normal meaning.
+#
+#   additional_source_patterns
+#      The pattern of additional pak files which need repacked, the name of
+#      pak always ends with '_${locale}.pak' e.g. foo_zh-CN.pak, since the
+#      locale is argument of template, the sources in this list should be
+#      the file name without '_${locale}.pak', tempate expands sources to
+#      the full name, e.g
+#         ${root_gen_dir}/foo expands to ${root_gen_dir}/foo_zh-CN.pak
+#       when locale is zh-CN.
+#
+#   additional_deps
+#      The corresponding deps of additonal_source_patterns.
+#
 template("_repack_one_locale") {
   locale = invoker.locale
 
@@ -44,6 +57,12 @@ template("_repack_one_locale") {
     sources += [ "${root_gen_dir}/chrome/settings_strings.pak" ]
     deps += [ "//chrome/app:settings_strings" ]
 
+    if (defined(invoker.additional_source_patterns)) {
+      sources += process_file_template(invoker.additional_source_patterns,
+                                       [ "{{source}}_${locale}.pak" ])
+      deps += invoker.additional_deps
+    }
+
     if (use_ash) {
       sources += [ "${root_gen_dir}/ash/strings/ash_strings_${locale}.pak" ]
       deps += [ "//ash/strings" ]
@@ -132,6 +151,16 @@ template("_repack_one_locale") {
 #       input names. Mac uses different names in some cases.
 #
 #   visibility
+#
+#   additional_source_patterns
+#      Pass to template("_repack_one_locale")
+#
+#   additional_deps
+#      Pass to template("_repack_one_locale")
+#
+#   output_dir
+#      this is used to override default output dir.
+#
 template("chrome_repack_locales") {
   # This is the name of the group below that will collect all the invidual
   # locale targets. External targets will depend on this.
@@ -165,6 +194,15 @@ template("chrome_repack_locales") {
       } else {
         output = "${root_out_dir}/locales/${output_locale}.pak"
       }
+
+      if (defined(invoker.output_dir)) {

[agrieve, 2016/07/06 19:49:17]

nit: this should be made a part of the above if clause. E.g.

if (defined(invoker.output_dir)) {
  output = ...
} else if (is_mac || is_ios) {
 ...

[michaelbai, 2016/07/06 20:05:17]

Done.

+        output = "${invoker.output_dir}/${output_locale}.pak"
+      }
+
+      if (defined(invoker.additional_source_patterns)) {
+        additional_source_patterns = invoker.additional_source_patterns
+        additional_deps = invoker.additional_deps
+      }
     }
 
     current_index = current_index + 1