diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/chrome/chrome_paks.gni | |
parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/chrome_paks.gni')
-rw-r--r-- | chromium/chrome/chrome_paks.gni | 69 |
1 files changed, 36 insertions, 33 deletions
diff --git a/chromium/chrome/chrome_paks.gni b/chromium/chrome/chrome_paks.gni index 1f9a1fc9a68..a7778f929af 100644 --- a/chromium/chrome/chrome_paks.gni +++ b/chromium/chrome/chrome_paks.gni @@ -130,45 +130,50 @@ template("chrome_extra_paks") { sources += invoker.additional_paks } - if (!is_android) { + if (is_android) { + sources += [ "$root_gen_dir/chrome/webapks_ui_resources.pak" ] + deps += [ "//chrome/browser/resources:webapks_ui_resources" ] + } else { # New paks should be added here by default. sources += [ "$root_gen_dir/chrome/component_extension_resources.pak", - "$root_gen_dir/chrome/options_resources.pak", "$root_gen_dir/chrome/settings_resources.pak", - "$root_gen_dir/chrome/sync_file_system_internals_resources.pak", "$root_gen_dir/content/browser/devtools/devtools_resources.pak", "$root_gen_dir/headless/headless_lib_resources.pak", ] deps += [ "//chrome/browser/resources:component_extension_resources", - "//chrome/browser/resources:options_resources", "//chrome/browser/resources:settings_resources", - "//chrome/browser/resources:sync_file_system_internals_resources", "//content/browser/devtools:devtools_resources", "//headless:resources", ] } if (is_chromeos) { sources += [ + "$root_gen_dir/chrome/options_resources.pak", "$root_gen_dir/components/chrome_apps/chrome_apps_resources.pak", "$root_gen_dir/ui/file_manager/file_manager_resources.pak", ] deps += [ + "//chrome/browser/resources:options_resources", "//components/chrome_apps:resources", "//ui/file_manager:resources", ] } if (enable_extensions) { sources += [ + "$root_gen_dir/chrome/sync_file_system_internals_resources.pak", "$root_gen_dir/extensions/extensions_renderer_resources.pak", "$root_gen_dir/extensions/extensions_resources.pak", ] - deps += [ "//extensions:extensions_resources" ] + deps += [ + "//chrome/browser/resources:sync_file_system_internals_resources", + "//extensions:extensions_resources", + ] } - if (is_android) { - sources += [ "$root_gen_dir/chrome/webapks_ui_resources.pak" ] - deps += [ "//chrome/browser/resources:webapks_ui_resources" ] + if (enable_vr) { + sources += [ "$root_gen_dir/chrome/vr_shell_resources.pak" ] + deps += [ "//chrome/browser/resources:vr_shell_resources" ] } } } @@ -183,7 +188,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. -# exclude_locale_paks: if set to true, skip chrome_repack_locales. +# locale_whitelist: if set, override repack_whitelist for locale .pak files. # copy_data_to_bundle: # deps: # output_dir: @@ -233,25 +238,26 @@ template("chrome_paks") { } } - 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", + "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 } } @@ -260,11 +266,8 @@ 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" ] } |