| Index: chrome/chrome_paks.gni
|
| diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
|
| index cb0cc645f1d5628b0019578608bf914b85b62f47..4e303dca2d4a4c9282a16a607661cda076d5e5ea 100644
|
| --- a/chrome/chrome_paks.gni
|
| +++ b/chrome/chrome_paks.gni
|
| @@ -185,7 +185,8 @@
|
| # output_dir [required]: Directory to output .pak files. Locale .pak files
|
| # will always be place in $output_dir/locales
|
| # additional_extra_paks: List of extra .pak sources for resources.pak.
|
| -# exclude_locale_paks: if set to true, skip chrome_repack_locales.
|
| +# additional_locale_source_patterns: additional_source_patterns for
|
| +# chrome_repack_locales().
|
| # copy_data_to_bundle:
|
| # deps:
|
| # output_dir:
|
| @@ -235,25 +236,25 @@
|
| }
|
| }
|
|
|
| - if (!defined(invoker.exclude_locale_paks) ||
|
| - !invoker.exclude_locale_paks) {
|
| - chrome_repack_locales("${target_name}_locales") {
|
| - forward_variables_from(invoker,
|
| - [
|
| - "copy_data_to_bundle",
|
| - "deps",
|
| - "repack_whitelist",
|
| - "visibility",
|
| - ])
|
| -
|
| - input_locales = locales
|
| - output_dir = "${invoker.output_dir}/locales"
|
| -
|
| - if (is_mac) {
|
| - output_locales = locales_as_mac_outputs
|
| - } else {
|
| - output_locales = locales
|
| - }
|
| + chrome_repack_locales("${target_name}_locales") {
|
| + forward_variables_from(invoker,
|
| + [
|
| + "copy_data_to_bundle",
|
| + "deps",
|
| + "repack_whitelist",
|
| + "visibility",
|
| + ])
|
| +
|
| + if (defined(invoker.additional_locale_source_patterns)) {
|
| + additional_source_patterns = invoker.additional_locale_source_patterns
|
| + }
|
| + input_locales = locales
|
| + output_dir = "${invoker.output_dir}/locales"
|
| +
|
| + if (is_mac) {
|
| + output_locales = locales_as_mac_outputs
|
| + } else {
|
| + output_locales = locales
|
| }
|
| }
|
|
|
| @@ -262,11 +263,8 @@
|
| public_deps = [
|
| ":${target_name}_100_percent",
|
| ":${target_name}_extra",
|
| - ]
|
| - if (!defined(invoker.exclude_locale_paks) ||
|
| - !invoker.exclude_locale_paks) {
|
| - public_deps += [ ":${target_name}_locales" ]
|
| - }
|
| + ":${target_name}_locales",
|
| + ]
|
| if (enable_hidpi) {
|
| public_deps += [ ":${target_name}_200_percent" ]
|
| }
|
|
|