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..3602e9d48dbfefc6ea465535e674c2ce8ea60b59 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" ]

[Nick Bray (chromium), 2015/02/25 22:52:40]

I think this should be on monacl_sel, instead?

[Dirk Pranke, 2015/02/25 23:23:40]

Done.

   }
 }
 
@@ -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.
@@ -44,20 +47,6 @@ if (!is_nacl) {
       ":mojo_nacl_codegen($default_toolchain)",
     ]
   }
-
-  # A simple shell for running untrusted binaries that talk to the Mojo
-  # embedder. (No services.)
-  executable("monacl_shell") {
-    testonly = true
-    sources = [
-      "monacl_shell.cc",
-    ]
-    deps = [
-      "//base:base",
-      "//third_party/mojo/src/mojo/edk/system:system",
-      ":monacl_sel",
-    ]
-  }
 }
 
 # Untrusted code
@@ -68,37 +57,22 @@ if (is_nacl) {
       "$gen_dir/libmojo.cc",
       "$gen_dir/mojo_irt.h",
     ]
-    include_dirs = [ "$root_build_dir/gen" ]
-    deps = [
-      ":mojo_nacl_codegen($default_toolchain)",
-    ]
-  }
 
-  # Unit test for the Mojo public API.
-  executable("monacl_test") {
-    testonly = true
-    sources = [
-      "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc",
-      "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc",
-    ]
-    deps = [
-      "//testing/gtest:gtest",
-      "//testing/gtest:gtest_main",
-      "//third_party/mojo/src/mojo/public/c/system/tests:tests",
-      "//third_party/mojo/src/mojo/public/cpp/system:system",
-      ":mojo",
+    public_configs =
+        [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ]
+
+    public_deps = [
+      ":mojo_nacl_codegen($default_toolchain)",
     ]
   }
 
-  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" ]
-    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",
@@ -106,17 +80,3 @@ if (is_nacl) {
     ]
   }
 }
-
-group("mojo_nacl") {
-  deps = [
-    ":irt_mojo(//native_client/build/toolchain/nacl:irt_${current_cpu})",
-  ]
-}
-
-group("mojo_nacl_tests") {
-  testonly = true
-  deps = [
-    ":monacl_shell",
-    ":monacl_test(//native_client/build/toolchain/nacl:clang_newlib_${current_cpu})",
-  ]
-}