Land prep work to enable NaCl in the Linux x64 GN builds.

mojo/nacl/BUILD.gn

Index: mojo/nacl/BUILD.gn
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index 222d45f6b94cf8f58e0df2881bf6f48015d482e8..2986f0b09f880950f025458e621e16c8d016edc0 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -23,6 +23,8 @@ if (current_toolchain == default_toolchain) {
       "$gen_dir/mojo_syscall.cc",
       "$gen_dir/libmojo.cc",
     ]
+    public_configs =
+        [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ]

[Dirk Pranke, 2015/02/25 21:08:46]

I'm not sure if this is the right way to handle this ...

[brettw, 2015/02/25 21:27:29]

Doesn't look obviously wrong to me.

[Dirk Pranke, 2015/02/25 21:37:40]

Acknowledged.

   }
 }
 
@@ -35,6 +37,7 @@ if (!is_nacl) {
       "$gen_dir/mojo_syscall.cc",
       "monacl_sel_main.cc",
     ]
+
     deps = [
       # This target makes sure we have all the pre-processor defines needed to
       # use NaCl's headers.
@@ -69,7 +72,7 @@ if (is_nacl) {
       "$gen_dir/mojo_irt.h",
     ]
     include_dirs = [ "$root_build_dir/gen" ]
-    deps = [
+    public_deps = [
       ":mojo_nacl_codegen($default_toolchain)",
     ]
   }
@@ -81,6 +84,7 @@ if (is_nacl) {
       "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc",
       "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc",
     ]
+    include_dirs = [ "//third_party/mojo/src" ]

[brettw, 2015/02/25 21:27:29]

We shouldn't have to specify this kind of thing manually. It should come from
some appropriate config. What's the error you're trying to solve?

[Dirk Pranke, 2015/02/25 21:37:40]

Agreed, which is partially why I had the comment above. However, per ncbray we
can actually just delete these targets as they shouldn't be in chromium at all.

     deps = [
       "//testing/gtest:gtest",
       "//testing/gtest:gtest_main",
@@ -90,21 +94,31 @@ if (is_nacl) {
     ]
   }
 
-  executable("irt_mojo") {
+  source_set("irt_mojo_sources") {
     cflags_c = [ "-std=c99" ]
     sources = [
-      "irt_entry_mojo.c",
       "$gen_dir/mojo_irt.c",
       "$gen_dir/mojo_irt.h",
     ]
     include_dirs = [ "$root_build_dir/gen" ]

[brettw, 2015/02/25 21:27:29]

You can delete this line, it should be there by default.

[Dirk Pranke, 2015/02/25 21:37:41]

It didn't seem to be, but I'll double check. Maybe I misred the error somewhere.

-    deps = [
+    public_deps = [
       "//native_client/build/config/nacl:nacl_base",
       "//native_client/src/untrusted/irt:irt_core_lib",
       "//native_client/src/untrusted/nacl:imc_syscalls",
       ":mojo_nacl_codegen($default_toolchain)",
     ]
   }
+
+  executable("irt_mojo") {
+    cflags_c = [ "-std=c99" ]
+    sources = [
+      "irt_entry_mojo.c",
+    ]
+    include_dirs = [ "$root_build_dir/gen" ]
+    deps = [
+      ":irt_mojo_sources",
+    ]
+  }
 }
 
 group("mojo_nacl") {