| OLD | NEW |
| 1 # All toolchains use the same generated code. | 1 # All toolchains use the same generated code. |
| 2 gen_dir = "$root_build_dir/gen/mojo/nacl" | 2 gen_dir = "$root_build_dir/gen/mojo/nacl" |
| 3 | 3 |
| 4 # Only allow the generator to be run by one toolchain. | 4 # Only allow the generator to be run by one toolchain. |
| 5 if (current_toolchain == default_toolchain) { | 5 if (current_toolchain == default_toolchain) { |
| 6 # Generate the code to plumb the Mojo public API into the NaCl sandbox. | 6 # Generate the code to plumb the Mojo public API into the NaCl sandbox. |
| 7 action("mojo_nacl_codegen") { | 7 action("mojo_nacl_codegen") { |
| 8 script = "generator/generate_nacl_bindings.py" | 8 script = "generator/generate_nacl_bindings.py" |
| 9 args = [ | 9 args = [ |
| 10 "-d", | 10 "-d", |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 # Trusted code | 27 # Trusted code |
| 28 if (!is_nacl) { | 28 if (!is_nacl) { |
| 29 # A library for launching a NaCl sandbox connected to a Mojo embedder. | 29 # A library for launching a NaCl sandbox connected to a Mojo embedder. |
| 30 static_library("monacl_sel") { | 30 static_library("monacl_sel") { |
| 31 sources = [ | 31 sources = [ |
| 32 "mojo_syscall_internal.h", | 32 "mojo_syscall_internal.h", |
| 33 "$gen_dir/mojo_syscall.cc", | 33 "$gen_dir/mojo_syscall.cc", |
| 34 "monacl_sel_main.cc", | 34 "monacl_sel_main.cc", |
| 35 ] | 35 ] |
| 36 |
| 37 include_dirs = [ "//third_party/mojo/src" ] |
| 38 |
| 36 deps = [ | 39 deps = [ |
| 37 # This target makes sure we have all the pre-processor defines needed to | 40 # This target makes sure we have all the pre-processor defines needed to |
| 38 # use NaCl's headers. | 41 # use NaCl's headers. |
| 39 "//native_client/build/config/nacl:nacl_base", | 42 "//native_client/build/config/nacl:nacl_base", |
| 40 "//native_client/src/trusted/desc:nrd_xfer", | 43 "//native_client/src/trusted/desc:nrd_xfer", |
| 41 "//native_client/src/trusted/service_runtime:sel_main_chrome", | 44 "//native_client/src/trusted/service_runtime:sel_main_chrome", |
| 42 ":mojo_nacl_codegen($default_toolchain)", | 45 ":mojo_nacl_codegen($default_toolchain)", |
| 43 ] | 46 ] |
| 44 } | 47 } |
| 45 | 48 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 61 # Untrusted code | 64 # Untrusted code |
| 62 if (is_nacl) { | 65 if (is_nacl) { |
| 63 # Thunk mapping the Mojo public API onto NaCl syscalls. | 66 # Thunk mapping the Mojo public API onto NaCl syscalls. |
| 64 static_library("mojo") { | 67 static_library("mojo") { |
| 65 sources = [ | 68 sources = [ |
| 66 "$gen_dir/libmojo.cc", | 69 "$gen_dir/libmojo.cc", |
| 67 ] | 70 ] |
| 68 deps = [ | 71 deps = [ |
| 69 ":mojo_nacl_codegen($default_toolchain)", | 72 ":mojo_nacl_codegen($default_toolchain)", |
| 70 ] | 73 ] |
| 74 include_dirs = [ "//third_party/mojo/src" ] |
| 71 } | 75 } |
| 72 | 76 |
| 73 # Unit test for the Mojo public API. | 77 # Unit test for the Mojo public API. |
| 74 executable("monacl_test") { | 78 executable("monacl_test") { |
| 75 testonly = true | 79 testonly = true |
| 76 sources = [ | 80 sources = [ |
| 77 "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc", | 81 "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc", |
| 78 "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc", | 82 "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc", |
| 79 ] | 83 ] |
| 84 include_dirs = [ "//third_party/mojo/src" ] |
| 80 deps = [ | 85 deps = [ |
| 81 "//native_client/src/untrusted/nacl:imc_syscalls", | 86 "//native_client/src/untrusted/nacl:imc_syscalls", |
| 82 "//testing/gtest:gtest", | 87 "//testing/gtest:gtest", |
| 83 "//testing/gtest:gtest_main", | 88 "//testing/gtest:gtest_main", |
| 84 "//third_party/mojo/src/mojo/public/c/system/tests:tests", | 89 "//third_party/mojo/src/mojo/public/c/system/tests:tests", |
| 85 "//third_party/mojo/src/mojo/public/cpp/system:system", | 90 "//third_party/mojo/src/mojo/public/cpp/system:system", |
| 86 ":mojo", | 91 ":mojo", |
| 87 ] | 92 ] |
| 88 } | 93 } |
| 89 } | 94 } |
| 90 | 95 |
| 91 group("mojo_nacl") { | 96 group("mojo_nacl") { |
| 92 deps = [ | 97 deps = [ |
| 93 "//native_client/src/untrusted/irt:irt_core(//native_client/build/toolchain/
nacl:irt_${cpu_arch})", | 98 "//native_client/src/untrusted/irt:irt_core(//native_client/build/toolchain/
nacl:irt_${cpu_arch})", |
| 94 ] | 99 ] |
| 95 } | 100 } |
| 96 | 101 |
| 97 group("mojo_nacl_tests") { | 102 group("mojo_nacl_tests") { |
| 98 testonly = true | 103 testonly = true |
| 99 deps = [ | 104 deps = [ |
| 100 ":monacl_shell", | 105 ":monacl_shell", |
| 101 ":monacl_test(//native_client/build/toolchain/nacl:clang_newlib_${cpu_arch})
", | 106 ":monacl_test(//native_client/build/toolchain/nacl:clang_newlib_${cpu_arch})
", |
| 102 ] | 107 ] |
| 103 } | 108 } |
| OLD | NEW |