Index: chrome/BUILD.gn |
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn |
index aa67e96e67f7843df67ccc4146b956a977d33312..ea096cef7817e717e29da952928b83de59ade257 100644 |
--- a/chrome/BUILD.gn |
+++ b/chrome/BUILD.gn |
@@ -1174,20 +1174,16 @@ group("browser_dependencies") { |
# GYP version: chromium_child_dependencies variable in chrome.gyp |
group("child_dependencies") { |
public_deps = [ |
+ "//chrome/browser/devtools", |
+ "//chrome/child", |
"//chrome/common", |
+ "//chrome/gpu", |
+ "//chrome/renderer", |
+ "//chrome/utility", |
"//components/sync", |
+ "//content/public/child", |
+ "//third_party/WebKit/public:blink_devtools_frontend_resources", |
] |
- if (!is_ios) { |
- public_deps += [ |
- "//chrome/browser/devtools", |
- "//chrome/child", |
- "//chrome/gpu", |
- "//chrome/renderer", |
- "//chrome/utility", |
- "//content/public/child", |
- "//third_party/WebKit/public:blink_devtools_frontend_resources", |
- ] |
- } |
if (enable_nacl) { |
public_deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] |
@@ -1283,19 +1279,15 @@ group("resources") { |
# GYP version: chrome/chrome_resources.gyp:chrome_extra_resources |
group("extra_resources") { |
public_deps = [ |
+ "//chrome/browser/resources:component_extension_resources", |
"//chrome/browser/resources:invalidations_resources", |
"//chrome/browser/resources:net_internals_resources", |
+ "//chrome/browser/resources:options_resources", |
"//chrome/browser/resources:password_manager_internals_resources", |
"//chrome/browser/resources:policy_resources", |
+ "//chrome/browser/resources:settings_resources", |
"//chrome/browser/resources:translate_internals_resources", |
] |
- if (!is_ios) { |
- public_deps += [ |
- "//chrome/browser/resources:component_extension_resources", |
- "//chrome/browser/resources:options_resources", |
- "//chrome/browser/resources:settings_resources", |
- ] |
- } |
if (is_chromeos) { |
public_deps += [ "//chrome/browser/resources/chromeos/chromevox" ] |
@@ -1367,6 +1359,7 @@ group("packed_resources") { |
repack("packed_extra_resources") { |
visibility = [ "./*" ] |
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", |
@@ -1376,6 +1369,8 @@ repack("packed_extra_resources") { |
"$root_gen_dir/chrome/policy_resources.pak", |
"$root_gen_dir/chrome/translate_internals_resources.pak", |
"$root_gen_dir/components/components_resources.pak", |
+ "$root_gen_dir/content/browser/tracing/tracing_resources.pak", |
+ "$root_gen_dir/content/content_resources.pak", |
"$root_gen_dir/net/net_resources.pak", |
"$root_gen_dir/ui/resources/webui_resources.pak", |
] |
@@ -1389,15 +1384,17 @@ repack("packed_extra_resources") { |
"//chrome/browser/resources:translate_internals_resources", |
"//chrome/common:resources", |
"//components/resources", |
+ "//content:resources", |
+ "//content/browser/tracing:resources", |
"//net:net_resources", |
+ "//third_party/WebKit/public:resources", |
"//ui/resources", |
] |
if (is_android) { |
sources += [ "$root_gen_dir/android_webview/aw_resources.pak" ] |
deps += [ "//android_webview:generate_aw_resources" ] |
- } |
- if (!is_ios && !is_android) { |
+ } else { # Non-Android. |
# New paks should be added here by default. |
sources += [ |
"$root_gen_dir/blink/devtools_resources.pak", |
@@ -1416,18 +1413,6 @@ repack("packed_extra_resources") { |
"//content/browser/devtools:devtools_resources", |
] |
} |
- if (!is_ios) { |
- sources += [ |
- "$root_gen_dir/blink/public/resources/blink_resources.pak", |
- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", |
- "$root_gen_dir/content/content_resources.pak", |
- ] |
- deps += [ |
- "//content:resources", |
- "//content/browser/tracing:resources", |
- "//third_party/WebKit/public:resources", |
- ] |
- } |
if (is_chromeos) { |
sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ] |
deps += [ "//ui/file_manager:resources" ] |
@@ -1440,10 +1425,7 @@ repack("packed_extra_resources") { |
deps += [ "//extensions:extensions_resources" ] |
} |
- # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms |
- # it them copies it. This skipes the copy step and writes it to the final |
- # location. |
- if (is_mac || is_ios) { |
+ if (is_mac) { |
output = "$root_gen_dir/repack/resources.pak" |
} else { |
output = "$root_out_dir/resources.pak" |
@@ -1519,9 +1501,11 @@ template("chrome_repack_percent") { |
# All sources should also have deps for completeness. |
sources = [ |
+ "$root_gen_dir/blink/public/resources/blink_image_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/ui/resources/ui_resources_${percent}_percent.pak", |
] |
@@ -1530,20 +1514,12 @@ template("chrome_repack_percent") { |
"//chrome/renderer:resources", |
"//components/resources", |
"//components/strings", |
+ "//content/app/resources", |
"//net:net_resources", |
+ "//third_party/WebKit/public:image_resources", |
"//ui/resources", |
] |
- if (!is_ios) { |
- sources += [ |
- "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_percent.pak", |
- "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak", |
- ] |
- deps += [ |
- "//content/app/resources", |
- "//third_party/WebKit/public:image_resources", |
- ] |
- } |
if (use_ash) { |
sources += |
[ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ] |