summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-07-22 10:22:13 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-22 17:22:49 +0000
commitd412f6ea2fea54b4d8f14d711768697be82820be (patch)
tree78201b89588cd25d94de9245ba1b1c032dc00d15
parent53b670d8362e4b2e348e77f243f595666a34a70d (diff)
downloadchromium_src-d412f6ea2fea54b4d8f14d711768697be82820be.zip
chromium_src-d412f6ea2fea54b4d8f14d711768697be82820be.tar.gz
chromium_src-d412f6ea2fea54b4d8f14d711768697be82820be.tar.bz2
Gets gn check to execute cleanly in mojo/application
Long term I don't think we want some of these dependendencies, but they are there so gn should reflect that. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1247853006 Cr-Commit-Position: refs/heads/master@{#339896}
-rw-r--r--.gn3
-rw-r--r--mojo/application/public/cpp/BUILD.gn7
2 files changed, 9 insertions, 1 deletions
diff --git a/.gn b/.gn
index 5bb2d01..2b45316 100644
--- a/.gn
+++ b/.gn
@@ -71,7 +71,8 @@ check_targets = [
#"//jingle/*",
#"//media/*", # Lots of errors.
- #"//mojo/*",
+ "//mojo/application/*",
+
#"//native_client/*",
#"//net/*", # Needs GN binary changes to work on Android.
diff --git a/mojo/application/public/cpp/BUILD.gn b/mojo/application/public/cpp/BUILD.gn
index 4e10109..6351691 100644
--- a/mojo/application/public/cpp/BUILD.gn
+++ b/mojo/application/public/cpp/BUILD.gn
@@ -66,7 +66,13 @@ source_set("content_handler") {
]
deps = [
":cpp",
+
+ # TODO: this code should not depend on base.
"//base",
+ "//mojo/application/public/interfaces:interfaces_cpp_sources",
+
+ # TODO: this code should not depend on mojo/common.
+ "//mojo/common:common_base",
"//mojo/services/network/public/interfaces",
]
}
@@ -83,6 +89,7 @@ source_set("test_support") {
":cpp",
"//base",
"//base/test:test_support",
+ "//mojo/application/public/interfaces:interfaces_cpp_sources",
"//third_party/mojo/src/mojo/public/cpp/bindings",
"//third_party/mojo/src/mojo/public/cpp/environment",
"//third_party/mojo/src/mojo/public/cpp/system",