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

Unified Diff: chrome/chrome_paks.gni

Issue 2980773002: Revert of Deduplicate Monochrome locale .paks (Closed)
Patch Set: Created 3 years, 5 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/descriptors_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_paks.gni
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index 94ccca2af760ac5f642f7145fe3b5cbc8ba8d08f..235ee7086cf7b1188f73964116fb596f12070634 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -184,7 +184,7 @@
# 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.
-# locale_whitelist: if set, override repack_whitelist for locale .pak files.
+# exclude_locale_paks: if set to true, skip chrome_repack_locales.
# copy_data_to_bundle:
# deps:
# output_dir:
@@ -234,26 +234,24 @@
}
}
- chrome_repack_locales("${target_name}_locales") {
- forward_variables_from(invoker,
- [
- "copy_data_to_bundle",
- "deps",
- "visibility",
- ])
- if (defined(invoker.locale_whitelist)) {
- repack_whitelist = invoker.locale_whitelist
- } else if (defined(invoker.repack_whitelist)) {
- repack_whitelist = invoker.repack_whitelist
- }
-
- 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
+ }
}
}
@@ -262,8 +260,10 @@
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" ]
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/descriptors_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698