summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-07-23 11:05:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-23 18:06:34 +0000
commitc43de408ec5e514060a295eb4f6663da397ec6a2 (patch)
tree0ad090a77952ef1643359ea685e57e89e91f31a8
parent70d03b798b63f39cd7ad45b1d054db91588b6588 (diff)
downloadchromium_src-c43de408ec5e514060a295eb4f6663da397ec6a2.zip
chromium_src-c43de408ec5e514060a295eb4f6663da397ec6a2.tar.gz
chromium_src-c43de408ec5e514060a295eb4f6663da397ec6a2.tar.bz2
Gets gn check to execute cleanly in most other mojo dirs
platform_handle, gles2 and common are trickier, but I want to get the rest of the dirs checked until resolved. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1255543002 Cr-Commit-Position: refs/heads/master@{#340111}
-rw-r--r--.gn25
-rw-r--r--mojo/common/BUILD.gn2
-rw-r--r--mojo/converters/surfaces/BUILD.gn1
-rw-r--r--mojo/environment/BUILD.gn2
-rw-r--r--mojo/gpu/BUILD.gn1
-rw-r--r--mojo/services/network/BUILD.gn6
-rw-r--r--mojo/services/tracing/BUILD.gn1
-rw-r--r--mojo/shell/BUILD.gn1
8 files changed, 37 insertions, 2 deletions
diff --git a/.gn b/.gn
index 2b45316..cfebd67 100644
--- a/.gn
+++ b/.gn
@@ -71,7 +71,30 @@ check_targets = [
#"//jingle/*",
#"//media/*", # Lots of errors.
- "//mojo/application/*",
+ "mojo/android/*",
+ "mojo/application/*",
+ "mojo/build/*",
+ "mojo/cc/*",
+
+ # TODO(sky): resolve this.
+ # "mojo/common/*",
+ "mojo/converters/*",
+ "mojo/environment/*",
+
+ # TODO(sky): resolve this.
+ # "mojo/gles2/*",
+ "mojo/gpu/*",
+ "mojo/nacl/*",
+
+ # TODO(sky): resolve this.
+ # "mojo/platform_handle/*",
+ "mojo/public/*",
+ "mojo/runner/*",
+ "mojo/services/*",
+ "mojo/shell/*",
+ "mojo/test/*",
+ "mojo/tools/*",
+ "mojo/util/*",
#"//native_client/*",
#"//net/*", # Needs GN binary changes to work on Android.
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index e87167c..1548798 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -56,6 +56,7 @@ source_set("url_type_converters") {
":common_base",
"//base",
"//base/third_party/dynamic_annotations",
+ "//third_party/mojo/src/mojo/public/cpp/bindings",
"//url",
]
}
@@ -66,6 +67,7 @@ test("mojo_common_unittests") {
":common",
"//base",
"//base:message_loop_tests",
+ "//base/test:test_support",
"//mojo/environment:chromium",
"//testing/gtest",
"//third_party/mojo/src/mojo/edk/test:run_all_unittests",
diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn
index d4fec16..9bcc72f 100644
--- a/mojo/converters/surfaces/BUILD.gn
+++ b/mojo/converters/surfaces/BUILD.gn
@@ -26,6 +26,7 @@ component("surfaces") {
"//base",
"//cc",
"//cc/surfaces",
+ "//cc/surfaces:surface_id",
"//components/view_manager/public/interfaces",
"//gpu",
"//ui/gfx/geometry",
diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn
index 4dbe7c4..9621dfb 100644
--- a/mojo/environment/BUILD.gn
+++ b/mojo/environment/BUILD.gn
@@ -56,6 +56,6 @@ component("chromium_impl") {
"//base",
"//base/third_party/dynamic_annotations",
"//mojo/common:common_base",
- "//third_party/mojo/src/mojo/public/c/environment",
+ "//third_party/mojo/src/mojo/public/cpp/environment:environment",
]
}
diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn
index 41f0413..4c5e350 100644
--- a/mojo/gpu/BUILD.gn
+++ b/mojo/gpu/BUILD.gn
@@ -11,6 +11,7 @@ source_set("mojo_gles2_implementation") {
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
deps = [
+ "//base",
"//gpu/command_buffer/client:gles2_interface",
"//third_party/mojo/src/mojo/public/c/gles2",
]
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index ceb4519..0b9e804 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -89,7 +89,10 @@ source_set("lib") {
deps = [
"//base",
+ "//components/filesystem/public/interfaces",
"//mojo/application/public/cpp",
+ "//mojo/common:common_base",
+ "//mojo/common:url_type_converters",
"//mojo/services/network/public/cpp",
"//mojo/services/network/public/interfaces",
"//net",
@@ -97,6 +100,7 @@ source_set("lib") {
"//net:http_server",
"//url",
"//sql/mojo",
+ "//third_party/mojo/src/mojo/public/cpp/system:system",
]
}
@@ -132,7 +136,9 @@ mojo_native_application("apptests") {
":lib",
":network",
"//base",
+ "//mojo/application/public/cpp:sources",
"//mojo/application/public/cpp:test_support",
+ "//mojo/common:common_base",
"//mojo/services/network/public/cpp",
"//mojo/services/network/public/interfaces",
"//net",
diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn
index c618f37..235374f 100644
--- a/mojo/services/tracing/BUILD.gn
+++ b/mojo/services/tracing/BUILD.gn
@@ -35,5 +35,6 @@ source_set("lib") {
":bindings",
"//base",
"//mojo/application/public/cpp",
+ "//mojo/common:common_base",
]
}
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 5714d3b..15d9d9d 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -48,6 +48,7 @@ source_set("shell") {
deps = [
"//base/third_party/dynamic_annotations",
"//crypto:crypto",
+ "//mojo/application/public/cpp:sources",
"//url",
"//third_party/mojo/src/mojo/edk/system",
"//mojo/environment:chromium",