Mojo + NaCl prototype.

mojo/monacl.gyp

Index: mojo/monacl.gyp
diff --git a/mojo/monacl.gyp b/mojo/monacl.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..e8879a1a5b541e7e4015fc2645b68e1eb0f425b1
--- /dev/null
+++ b/mojo/monacl.gyp
@@ -0,0 +1,121 @@
+# Copyright 2014 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.
+
+{
+  'conditions': [
+    ['disable_nacl==0 and disable_nacl_untrusted==0', {
+      'variables': {
+        'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/monacl',
+      },
+      'includes': [
+        'mojo_variables.gypi',
+        '../build/common_untrusted.gypi',
+        '../components/nacl/nacl_defines.gypi',
+      ],
+      'targets': [
+        {
+          'target_name': 'monacl_codegen',
+          'type': 'none',
+          'actions': [
+            {
+              'action_name': 'generate_monacl_bindings',
+              'inputs': [
+                'monacl/generator/generate_monacl_bindings.py',
+                'monacl/generator/interface.py',
+                'monacl/generator/interface_dsl.py',
+                'monacl/generator/mojo_syscall.cc.template',
+                'monacl/generator/libmojo.cc.template',
+              ],
+              'outputs': [
+                '<(monacl_codegen_dir)/mojo_syscall.cc',
+                '<(monacl_codegen_dir)/libmojo.cc',
+              ],
+              'action': [
+                'python',
+                'monacl/generator/generate_monacl_bindings.py',
+                '-d', '<(monacl_codegen_dir)',
+              ],
+            },
+          ],
+        },
+        {
+          'target_name': 'monacl_sel',
+          'type': 'static_library',
+          'defines': [
+            '<@(nacl_defines)',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            '<(monacl_codegen_dir)/mojo_syscall.cc',
+            'monacl/monacl_sel_main.cc',
+          ],
+          'dependencies': [
+            '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
+          ],
+        },
+        {
+          'target_name': 'monacl_shell',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'mojo_base.gyp:mojo_system_impl',
+            'monacl_sel',
+            # Make sure the IRT is built.
+            '<(DEPTH)/native_client/src/untrusted/irt/irt.gyp:irt_core_nexe',
+          ],
+          'sources': [
+            'monacl/monacl_shell.cc',
+          ],
+        },
+        {
+          'target_name': 'mojo_nacl',
+          'type': 'none',
+          'variables': {
+            'nlib_target': 'libmojo.a',
+            'build_glibc': 0,
+            'build_newlib': 1,
+            'build_pnacl_newlib': 0,
+          },
+          'defines': [
+            '<@(nacl_defines)',
+          ],
+          'sources': [
+            '<(monacl_codegen_dir)/libmojo.cc',
+            '<(DEPTH)/native_client/src/untrusted/nacl/imc_sendmsg.c',

[Mark Seaborn, 2014/09/09 19:13:10]

Shouldn't be needed, since you use imc_syscalls_lib below.

[Nick Bray (chromium), 2014/09/09 23:12:32]

Done.

+          ],
+          'dependencies': [
+            'monacl_codegen',
+          ],
+        },
+        {
+          'target_name': 'monacl_test',
+          'type': 'none',
+          'variables': {
+            'nexe_target': 'monacl_test',
+            'build_newlib': 1,
+            'link_flags': [
+              '-pthread',

[Mark Seaborn, 2014/09/09 19:13:10]

Don't you also need to add libpthread to 'dependencies'?

[Nick Bray (chromium), 2014/09/09 23:12:32]

Done.

+              '-lmojo',
+              '-limc_syscalls',
+            ],
+            'sources': [
+              '<@(mojo_public_system_unittest_sources)',
+            ],
+          },
+          'dependencies': [
+            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
+            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
+            '../testing/gtest_nacl.gyp:gtest_nacl',
+            '../testing/gtest_nacl.gyp:gtest_main_nacl',
+            'mojo_nacl',
+            'monacl_codegen',
+          ],
+        },
+      ],
+    }],
+  ],
+}