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 3ce017d44c0cca6eb33e44cdfa62bff98430ec9f..e15035a0b34d94291e5cd63c3614532e9efc6533 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -33,6 +33,9 @@ if (!is_nacl) {
       "$gen_dir/mojo_syscall.cc",
       "monacl_sel_main.cc",
     ]
+
+    include_dirs = [ "//third_party/mojo/src" ]

[brettw, 2015/02/05 00:20:36]

It seems that this should reference a config rather than hardcoding directories.
It looks like internal mojo targets have the public config
//third_party/mojo/public/build/config:mojo_sdk. If you made that a
public_config of mojo_nacl_codegen, then this target and the "mojo" target would
get this automatically.

":mojo_nacl_codegen" should in turn be a public dep in "mojo" so it gets
forwarded to "monacl_test".

[Dirk Pranke, 2015/02/05 00:26:16]

Yeah, I thought about doing that but at the time was lazy and looking at other
things. Will do.
ok.

[Nick Bray (chromium), 2015/02/05 23:21:46]

This file should really be coming from the Mojo repo.  I suspect this issue
needs to be fixed upstream.

[Dirk Pranke, 2015/02/05 23:52:19]

Right, that's what brett is suggesting.

[Dirk Pranke, 2015/02/06 02:57:27]

Brett, Nick, are you two okay with me leaving this as a TODO w/ the appropriate
comments and letting ncbray sort this out, since he's the guy working on mojo +
nacl ?

[brettw, 2015/02/06 06:06:15]

I'm just concerned that if it gets moved it will be copied-and-pasted from here.
Since it's only a few line change, I think we should just make it here.

+
     deps = [
       # This target makes sure we have all the pre-processor defines needed to
       # use NaCl's headers.
@@ -68,6 +71,7 @@ if (is_nacl) {
     deps = [
       ":mojo_nacl_codegen($default_toolchain)",
     ]
+    include_dirs = [ "//third_party/mojo/src" ]
   }
 
   # Unit test for the Mojo public API.
@@ -77,6 +81,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" ]
     deps = [
       "//native_client/src/untrusted/nacl:imc_syscalls",
       "//testing/gtest:gtest",