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

Unified Diff: content/common/BUILD.gn

Issue 1442893002: Move Shell connection to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@i2
Patch Set: . Created 5 years, 1 month 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 | « content/browser/child_process_launcher.cc ('k') | content/common/mojo/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 2b9778ba3f973c51fe55966e8908c3aac98e2fcd..fbe711a7834dff20032a00973b20fb9607b3b604 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -133,6 +133,13 @@ source_set("common") {
".",
"//content")
+ # These files are only built in a GN build because they bring in
+ # dependencies that don't build with GYP.
+ sources += [
+ "mojo/mojo_shell_connection_impl.cc",
+ "mojo/mojo_shell_connection_impl.h",
+ ]
+
configs += [
"//content:content_implementation",
"//build/config:precompiled_headers",
@@ -146,10 +153,14 @@ source_set("common") {
deps = [
"//base",
"//build/util:webkit_version",
+ "//components/mus/public/interfaces",
"//components/tracing",
"//components/tracing:startup_tracing",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/command_buffer/common:gles2_utils",
+ "//mojo/application/public/cpp",
+ "//mojo/converters/network",
+ "//mojo/runner/child:lib",
"//net",
"//skia",
"//third_party/icu",
@@ -197,7 +208,7 @@ source_set("common") {
]
}
- defines = []
+ defines = [ "MOJO_SHELL_CLIENT" ]
include_dirs = []
libs = []
ldflags = []
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/common/mojo/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698