Chromium Code Reviews Chromium Code Reviews
Issue 385983008:
Mojo + NaCl prototype. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| (Empty) | |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | |
| 2 # Use of this source code is governed by a BSD-style license that can be | |
| 3 # found in the LICENSE file. | |
| 4 | |
| 5 { | |
| 6 'conditions': [ | |
| 7 ['disable_nacl==0 and disable_nacl_untrusted==0', { | |
| 8 'variables': { | |
| 9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl', | |
| 10 }, | |
| 11 'includes': [ | |
| 12 'mojo_variables.gypi', | |
| 13 '../build/common_untrusted.gypi', | |
| 14 '../components/nacl/nacl_defines.gypi', | |
| 15 ], | |
| 16 'targets': [ | |
| 17 { | |
| 18 'target_name': 'monacl_codegen', | |
| 19 'type': 'none', | |
| 20 'actions': [ | |
| 21 { | |
| 22 'action_name': 'generate_monacl_bindings', | |
| 23 'inputs': [ | |
| 24 'monacl/generator/generate_monacl_bindings.py', | |
| 25 'monacl/generator/interface.py', | |
| 26 'monacl/generator/interface_dsl.py', | |
| 27 'monacl/generator/mojo_syscall.cc.template', | |
| 28 'monacl/generator/libmojo.cc.template', | |
| 29 ], | |
| 30 'outputs': [ | |
| 31 '<(monacl_codegen_dir)/mojo_syscall.cc', | |
| 32 '<(monacl_codegen_dir)/libmojo.cc', | |
| 33 ], | |
| 34 'action': [ | |
| 35 'python', | |
| 36 'monacl/generator/generate_monacl_bindings.py', | |
| 37 '-d', '<(monacl_codegen_dir)', | |
| 38 ], | |
| 39 }, | |
| 40 ], | |
| 41 }, | |
| 42 { | |
| 43 'target_name': 'monacl_sel', | |
| 44 'type': 'static_library', | |
| 45 'defines': [ | |
| 46 '<@(nacl_defines)', | |
| 47 ], | |
| 48 'include_dirs': [ | |
| 49 '..', | |
| 50 ], | |
| 51 'sources': [ | |
| 52 '<(monacl_codegen_dir)/mojo_syscall.cc', | |
| 53 'monacl/monacl_sel_main.cc', | |
| 54 ], | |
| 55 'dependencies': [ | |
| 56 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel', | |
| 57 ], | |
| 58 }, | |
| 59 { | |
| 60 'target_name': 'monacl_shell', | |
| 61 'type': 'executable', | |
| 62 'dependencies': [ | |
| 63 '../base/base.gyp:base', | |
| 64 'mojo_base.gyp:mojo_system_impl', | |
| 65 'monacl_sel', | |
| 66 # Make sure the IRT is built. | |
| 67 '<(DEPTH)/native_client/src/untrusted/irt/irt.gyp:irt_core_nexe', | |
| 68 ], | |
| 69 'sources': [ | |
| 70 'monacl/monacl_shell.cc', | |
| 71 ], | |
| 72 }, | |
| 73 { | |
| 74 'target_name': 'mojo_nacl', | |
| 75 'type': 'none', | |
| 76 'variables': { | |
| 77 'nlib_target': 'libmojo.a', | |
| 78 'build_glibc': 0, | |
| 79 'build_newlib': 1, | |
| 80 'build_pnacl_newlib': 0, | |
| 81 }, | |
| 82 'defines': [ | |
| 83 '<@(nacl_defines)', | |
| 84 ], | |
| 85 'sources': [ | |
| 86 '<(monacl_codegen_dir)/libmojo.cc', | |
| 87 '<(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_li
Nick Bray (chromium)
2014/09/09 23:12:32
Done.
| |
| 88 ], | |
| 89 'dependencies': [ | |
| 90 'monacl_codegen', | |
| 91 ], | |
| 92 }, | |
| 93 { | |
| 94 'target_name': 'monacl_test', | |
| 95 'type': 'none', | |
| 96 'variables': { | |
| 97 'nexe_target': 'monacl_test', | |
| 98 'build_newlib': 1, | |
| 99 'link_flags': [ | |
| 100 '-pthread', | |
|
Mark Seaborn
2014/09/09 19:13:10
Don't you also need to add libpthread to 'dependen
Nick Bray (chromium)
2014/09/09 23:12:32
Done.
| |
| 101 '-lmojo', | |
| 102 '-limc_syscalls', | |
| 103 ], | |
| 104 'sources': [ | |
| 105 '<@(mojo_public_system_unittest_sources)', | |
| 106 ], | |
| 107 }, | |
| 108 'dependencies': [ | |
| 109 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
| 110 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', | |
| 111 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib ', | |
| 112 '../testing/gtest_nacl.gyp:gtest_nacl', | |
| 113 '../testing/gtest_nacl.gyp:gtest_main_nacl', | |
| 114 'mojo_nacl', | |
| 115 'monacl_codegen', | |
| 116 ], | |
| 117 }, | |
| 118 ], | |
| 119 }], | |
| 120 ], | |
| 121 } | |
| OLD | NEW |
