diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
| commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
| tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/chrome/chrome_paks.gni | |
| parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
| download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz | |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/chrome/chrome_paks.gni')
| -rw-r--r-- | chromium/chrome/chrome_paks.gni | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chromium/chrome/chrome_paks.gni b/chromium/chrome/chrome_paks.gni index 94c5f759a0d..6d412994ffd 100644 --- a/chromium/chrome/chrome_paks.gni +++ b/chromium/chrome/chrome_paks.gni @@ -4,7 +4,7 @@ import("//build/config/locales.gni") import("//chrome/common/features.gni") -import("//extensions/features/features.gni") +import("//extensions/buildflags/buildflags.gni") import("//ui/base/ui_features.gni") import("chrome_repack_locales.gni") @@ -29,11 +29,11 @@ template("chrome_repack_percent") { # All sources should also have deps for completeness. sources = [ - "$root_gen_dir/blink/public/resources/blink_scaled_resources_${percent}_percent.pak", "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak", "$root_gen_dir/components/components_resources_${percent}_percent.pak", "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak", + "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak", "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", ] @@ -44,7 +44,7 @@ template("chrome_repack_percent") { "//components/strings", "//content/app/resources", "//net:net_resources", - "//third_party/WebKit/public:scaled_resources_${percent}_percent", + "//third_party/blink/public:scaled_resources_${percent}_percent", "//ui/resources", ] @@ -91,7 +91,6 @@ template("chrome_extra_paks") { ]) output = "${invoker.output_dir}/resources.pak" sources = [ - "$root_gen_dir/blink/public/resources/blink_resources.pak", "$root_gen_dir/chrome/browser_resources.pak", "$root_gen_dir/chrome/chrome_unscaled_resources.pak", "$root_gen_dir/chrome/common_resources.pak", @@ -105,6 +104,7 @@ template("chrome_extra_paks") { "$root_gen_dir/content/content_resources.pak", "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", "$root_gen_dir/net/net_resources.pak", + "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak", "$root_gen_dir/ui/resources/webui_resources.pak", ] deps = [ @@ -121,7 +121,7 @@ template("chrome_extra_paks") { "//content/browser/tracing:resources", "//mojo/public/js:resources", "//net:net_resources", - "//third_party/WebKit/public:resources", + "//third_party/blink/public:resources", "//ui/resources", ] if (defined(invoker.deps)) { @@ -151,10 +151,14 @@ template("chrome_extra_paks") { } if (is_chromeos) { sources += [ + "$root_gen_dir/chrome/multidevice_setup_resources.pak", + "$root_gen_dir/chromeos/chromeos_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/chromeos:multidevice_setup_resources", + "//chromeos/resources", "//components/chrome_apps:resources", "//ui/file_manager:resources", ] |