Rearrange mojo/nacl files.

nacl_bindings/BUILD.gn

Index: nacl_bindings/BUILD.gn
diff --git a/nacl_bindings/BUILD.gn b/nacl_bindings/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..05a763b2f48d94a5bebe5af201e60e8315855542
--- /dev/null
+++ b/nacl_bindings/BUILD.gn
@@ -0,0 +1,44 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../mojo/public/mojo_sdk.gni")
+
+# Trusted code
+if (!is_nacl) {
+  # A library for launching a NaCl sandbox connected to a Mojo embedder.
+  static_library("monacl_sel") {

[jamesr, 2015/02/26 00:23:22]

do you need this to be a static_library or is source_set ok? (this'll be in
practice a thin archive i think which is functionally similar to a source set,
not really a 'thick' .a)

[Nick Bray (chromium), 2015/02/26 01:16:02]

Done.

+    sources = [
+      "mojo_syscall_internal.h",
+      "mojo_syscall.cc",
+      "monacl_sel_main.cc",
+    ]
+    deps = [
+      rebase_path("mojo/public/c/system", ".", mojo_root),

[Nick Bray (chromium), 2015/02/25 22:14:36]

Note: a little funky, but this seemed cleaner than going full
mojo_sdk_source_set (particularly for the executable, below).

+
+      # This target makes sure we have all the pre-processor defines needed to
+      # use NaCl's headers.
+      "//native_client/build/config/nacl:nacl_base",
+      "//native_client/src/trusted/desc:nrd_xfer",
+      "//native_client/src/trusted/service_runtime:sel_main_chrome",
+    ]
+  }
+}
+
+# Untrusted code
+if (is_nacl) {
+  executable("irt_mojo") {
+    cflags_c = [ "-std=c99" ]
+    sources = [
+      "irt_entry_mojo.c",
+      "mojo_irt.c",
+      rebase_path("mojo/public/platform/nacl/mojo_irt.h", ".", mojo_root),

[jamesr, 2015/02/26 00:23:22]

it looks like nacl_bindings is always in the same place relative to mojo/public,
so could you use a relative path here? i.e.

../mojo/public/platform/nacl/mojo_irt.h

[Nick Bray (chromium), 2015/02/26 01:16:02]

Done.

+    ]
+    deps = [
+      rebase_path("mojo/public/c/system", ".", mojo_root),

[jamesr, 2015/02/26 00:23:22]

and same here?

../mojo/public/c/system

[Nick Bray (chromium), 2015/02/26 01:16:02]

Done.

+      "//native_client/build/config/nacl:nacl_base",
+      "//native_client/src/untrusted/irt:irt_core_lib",
+      "//native_client/src/untrusted/nacl:imc_syscalls",
+    ]
+  }
+}