Index: content/app/BUILD.gn |
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn |
index 21d91f9bdde026a0a63cb57f818008043ca15e65..9a3bbd1356d64b0478d58d79266ae54ca867de63 100644 |
--- a/content/app/BUILD.gn |
+++ b/content/app/BUILD.gn |
@@ -30,7 +30,6 @@ template("implement_content_app") { |
"//services/service_manager/public/interfaces", |
"//mojo/edk/system", |
"//ppapi/features", |
- "//third_party/WebKit/public:mojo_bindings", |
"//ui/base", |
"//ui/gfx", |
"//ui/gfx/geometry", |
@@ -47,8 +46,6 @@ template("implement_content_app") { |
"//content/browser", |
"//content/child", |
"//content/public/android:jni", |
- "//content/browser", |
- "//content/child", |
"//device/bluetooth", |
"//device/gamepad", |
"//device/generic_sensor", |
@@ -75,10 +72,6 @@ template("implement_content_app") { |
content_app_deps += [ "//content/ppapi_plugin:ppapi_plugin_sources" ] |
} |
- if (!is_multi_dll_chrome) { |
- content_app_deps += [ "//content/gpu:gpu_sources" ] |
- } |
- |
# Compile content_main_runner.cc in a separate target to exempt from GN |
# header checking without exempting any other source file. This file includes |
# headers of all process types and varies significantly per platform in |
@@ -97,6 +90,9 @@ template("implement_content_app") { |
configs += extra_configs |
deps = content_app_deps |
+ if (defined(invoker.deps)) { |
+ deps += invoker.deps |
+ } |
forward_variables_from(invoker, [ "defines" ]) |
} |
@@ -138,6 +134,21 @@ template("implement_content_app") { |
} |
} |
+group("content_app_browser_deps") { |
+ deps = [ |
+ "//content/browser", |
+ "//content/public/browser:browser_sources", |
+ ] |
+} |
+ |
+group("content_app_child_deps") { |
+ deps = [ |
+ "//content/public/gpu:gpu_sources", |
+ "//content/public/renderer:renderer_sources", |
+ "//content/public/utility:utility_sources", |
+ ] |
+} |
+ |
# This includes the app sources for both the browser and child processes. |
implement_content_app("both") { |
# Only the public target should depend on this. All other targets (even |
@@ -146,6 +157,13 @@ implement_content_app("both") { |
":both_for_content_tests", # See top of //content/BUILD.gn for why. |
"//content/public/app:*", |
] |
+ deps = [ |
+ ":content_app_browser_deps", |
+ ":content_app_child_deps", |
+ "//content/gpu:gpu_sources", |
+ "//content/renderer", |
+ "//content/utility", |
+ ] |
} |
# See comment at the top of //content/BUILD.gn for how this works. |
@@ -165,10 +183,16 @@ if (is_multi_dll_chrome) { |
implement_content_app("browser") { |
visibility = [ "//content/public/app:browser" ] |
defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ] |
+ deps = [ |
+ ":content_app_browser_deps", |
+ ] |
} |
implement_content_app("child") { |
visibility = [ "//content/public/app:child" ] |
defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] |
+ deps = [ |
+ ":content_app_child_deps", |
+ ] |
} |
} |