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 Committed: https://crrev.com/c43de408ec5e514060a295eb4f6663da397ec6a2 Cr-Commit-Position: refs/heads/master@{#340111} Review URL: https://codereview.chromium.org/1255543002 Cr-Commit-Position: refs/heads/master@{#340186}
qweri0p · Jul 23, 2015 · 71c3f2b · 71c3f2b
1 parent 8e78caf
commit 71c3f2b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/runner/BUILD.gn b/mojo/runner/BUILD.gn
@@ -59,6 +59,7 @@ source_set("mojo_runner_lib") {
       "//components/view_manager",
       "//mojo/shell",
       "//ui/gl",
+      "//ui/platform_window/android",
     ]
   }
 }

diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
@@ -89,14 +89,18 @@ 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",
     "//net:extras",
     "//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
@@ -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
@@ -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",