Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: chrome/chrome_paks.gni

Issue 2890813002: Separate WebView's locale paks from Chrome's locale paks (Closed)
Patch Set: renaming "stored" Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_paks.gni
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index 4e303dca2d4a4c9282a16a607661cda076d5e5ea..cb0cc645f1d5628b0019578608bf914b85b62f47 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -185,8 +185,7 @@ template("chrome_extra_paks") {
# 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.
-# additional_locale_source_patterns: additional_source_patterns for
-# chrome_repack_locales().
+# exclude_locale_paks: if set to true, skip chrome_repack_locales.
# copy_data_to_bundle:
# deps:
# output_dir:
@@ -236,25 +235,25 @@ template("chrome_paks") {
}
}
- 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
+ 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
+ }
}
}
@@ -263,8 +262,11 @@ template("chrome_paks") {
public_deps = [
":${target_name}_100_percent",
":${target_name}_extra",
- ":${target_name}_locales",
]
+ if (!defined(invoker.exclude_locale_paks) ||
+ !invoker.exclude_locale_paks) {
+ public_deps += [ ":${target_name}_locales" ]
+ }
if (enable_hidpi) {
public_deps += [ ":${target_name}_200_percent" ]
}

Powered by Google App Engine
This is Rietveld 408576698