| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # Trusted code | 5 # Trusted code |
| 6 if (!is_nacl) { | 6 if (!is_nacl) { |
| 7 # A simple shell for running untrusted binaries that talk to the Mojo | 7 # A simple shell for running untrusted binaries that talk to the Mojo |
| 8 # embedder. (No services.) | 8 # embedder. (No services.) |
| 9 if (current_cpu == "x86" || current_cpu == "arm") { | 9 if (current_cpu == "x86" || current_cpu == "arm") { |
| 10 # Non-SFI NaCl currently supports x86-32 and ARMv7, but not anything 64-bit. | 10 # Non-SFI NaCl currently supports x86-32 and ARMv7, but not anything 64-bit. |
| 11 # Additionally, PNaCl pexes assume 32-bit pointers. | 11 # Additionally, PNaCl pexes assume 32-bit pointers. |
| 12 executable("monacl_shell_nonsfi") { | 12 executable("monacl_shell_nonsfi") { |
| 13 testonly = true | 13 testonly = true |
| 14 sources = [ | 14 sources = [ |
| 15 "monacl_shell_nonsfi.cc", | 15 "monacl_shell_nonsfi.cc", |
| 16 ] | 16 ] |
| 17 deps = [ | 17 deps = [ |
| 18 ":irt_mojo_nonsfi", | 18 ":irt_mojo_nonsfi", |
| 19 "//mojo/edk/system", | 19 "//mojo/edk/system", |
| 20 "//mojo/gles2:mgl", |
| 21 "//mojo/public/cpp/environment:standalone", |
| 20 "//native_client/src/nonsfi/loader:elf_loader", | 22 "//native_client/src/nonsfi/loader:elf_loader", |
| 21 ] | 23 ] |
| 22 } | 24 } |
| 23 } | 25 } |
| 24 } | 26 } |
| 25 | 27 |
| 26 group("monacl_shell_nonsfi_x86") { | 28 group("monacl_shell_nonsfi_x86") { |
| 27 testonly = true | 29 testonly = true |
| 28 deps = [] | 30 deps = [] |
| 29 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { | 31 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { |
| 30 # Even when Mojo is built for x86-64 by default, we want to use x86-32 | 32 # Even when Mojo is built for x86-64 by default, we want to use x86-32 |
| 31 # for running programs under Non-SFI NaCl. | 33 # for running programs under Non-SFI NaCl. |
| 32 # The toolchain is hardcoded as 32-bit clang here -- although it must | 34 # The toolchain is hardcoded as 32-bit clang here -- although it must |
| 33 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would | 35 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would |
| 34 # be defined as the 32 bit variant of whatever is being used (be it clang, | 36 # be defined as the 32 bit variant of whatever is being used (be it clang, |
| 35 # gcc, or something else). | 37 # gcc, or something else). |
| 36 deps += [ ":monacl_shell_nonsfi(//build/toolchain/linux:clang_x86)" ] | 38 deps += [ ":monacl_shell_nonsfi(//build/toolchain/linux:clang_x86)" ] |
| 37 } | 39 } |
| 38 } | 40 } |
| 39 | 41 |
| 40 static_library("irt_mojo_nonsfi") { | 42 static_library("irt_mojo_nonsfi") { |
| 41 sources = [ | 43 sources = [ |
| 42 "irt_mojo_nonsfi.cc", | 44 "irt_mojo_nonsfi.cc", |
| 43 "irt_mojo_nonsfi.h", | 45 "irt_mojo_nonsfi.h", |
| 44 "nexe_launcher_nonsfi.cc", | 46 "nexe_launcher_nonsfi.cc", |
| 45 ] | 47 ] |
| 46 | 48 |
| 47 deps = [ | 49 deps = [ |
| 48 "//base", | 50 "//base", |
| 51 "//mojo/public/c/gpu:MGL", |
| 52 "//mojo/public/c/gpu:MGL_onscreen", |
| 53 "//mojo/public/c/gpu:MGL_signal_sync_point", |
| 49 "//mojo/public/c/system", | 54 "//mojo/public/c/system", |
| 50 "//mojo/public/platform/nacl:mojo_irt_header", | 55 "//mojo/public/platform/nacl:mojo_irt_header", |
| 51 "//native_client/src/nonsfi/irt:irt_interfaces", | 56 "//native_client/src/nonsfi/irt:irt_interfaces", |
| 52 ] | 57 ] |
| 53 } | 58 } |
| 54 | 59 |
| 55 group("mojo_nacl_nonsfi") { | 60 group("mojo_nacl_nonsfi") { |
| 56 deps = [ | 61 deps = [ |
| 57 "//services/nacl:nacl_content_handler_nonsfi", | 62 "//services/nacl:nacl_content_handler_nonsfi", |
| 58 ] | 63 ] |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 ] | 140 ] |
| 136 } | 141 } |
| 137 | 142 |
| 138 group("mojo_nacl_tests_nonsfi") { | 143 group("mojo_nacl_tests_nonsfi") { |
| 139 testonly = true | 144 testonly = true |
| 140 deps = [ | 145 deps = [ |
| 141 ":monacl_shell_nonsfi_x86", | 146 ":monacl_shell_nonsfi_x86", |
| 142 ":monacl_test_nonsfi_nexes", | 147 ":monacl_test_nonsfi_nexes", |
| 143 ] | 148 ] |
| 144 } | 149 } |
| OLD | NEW |