Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: mojo/nacl/BUILD.gn

Issue 1327913004: Added 32-bit version of nonsfi monacl shell (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 executable("monacl_shell") { 9 executable("monacl_shell") {
10 testonly = true 10 testonly = true
11 sources = [ 11 sources = [
12 "monacl_shell.cc", 12 "monacl_shell.cc",
13 ] 13 ]
14 deps = [ 14 deps = [
15 "//base:base", 15 "//base:base",
16 "//mojo/edk/system:system", 16 "//mojo/edk/system:system",
17 "//nacl_bindings:monacl_sel", 17 "//nacl_bindings:monacl_sel",
18 ] 18 ]
19 19
20 data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl :irt_${target_cpu})" ] 20 data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl :irt_${target_cpu})" ]
21 } 21 }
22 22
23 executable("monacl_shell_nonsfi") { 23 executable("monacl_shell_nonsfi") {
Sean Klein 2015/09/09 17:37:07 I don't have a solution for this at the moment, bu
Sean Klein 2015/09/09 17:55:45 With the most recent patch, I've worked around thi
24 testonly = true 24 testonly = true
25 sources = [ 25 sources = [
26 "monacl_shell_nonsfi.cc", 26 "monacl_shell_nonsfi.cc",
27 ] 27 ]
28 deps = [ 28 deps = [
29 ":irt_mojo_nonsfi", 29 ":irt_mojo_nonsfi",
30 "//mojo/edk/system", 30 "//mojo/edk/system",
31 "//native_client/src/nonsfi/loader:elf_loader", 31 "//native_client/src/nonsfi/loader:elf_loader",
32 ] 32 ]
33 } 33 }
34 } 34 }
35 35
36 group("monacl_shell_nonsfi_x86") {
Mark Seaborn 2015/09/08 23:57:43 Should this be added as a dependency of group("moj
Sean Klein 2015/09/09 17:37:07 I think it should be a dependency of "mojo_nacl_te
37 testonly = true
38 deps = [
39 ":monacl_shell_nonsfi(//build/toolchain/linux:clang_x86)",
Mark Seaborn 2015/09/08 23:57:43 Since this is Linux-specific, it seems like the ta
Sean Klein 2015/09/09 17:37:07 Added a conditional on "is_linux". Comment added.
40 ]
41 }
42
36 # Untrusted code 43 # Untrusted code
37 if (is_nacl) { 44 if (is_nacl) {
38 # Unit test for the Mojo public API. 45 # Unit test for the Mojo public API.
39 executable("monacl_test") { 46 executable("monacl_test") {
40 testonly = true 47 testonly = true
41 sources = [ 48 sources = [
42 "//mojo/public/cpp/system/tests/core_unittest.cc", 49 "//mojo/public/cpp/system/tests/core_unittest.cc",
43 "//mojo/public/cpp/system/tests/macros_unittest.cc", 50 "//mojo/public/cpp/system/tests/macros_unittest.cc",
44 ] 51 ]
45 deps = [ 52 deps = [
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 107 }
101 108
102 group("mojo_nacl_tests") { 109 group("mojo_nacl_tests") {
103 testonly = true 110 testonly = true
104 deps = [ 111 deps = [
105 ":mojo_nacl_tests_untrusted(//native_client/build/toolchain/nacl:clang_newli b_${current_cpu})", 112 ":mojo_nacl_tests_untrusted(//native_client/build/toolchain/nacl:clang_newli b_${current_cpu})",
106 ":monacl_shell", 113 ":monacl_shell",
107 ":mojo_pnacl_tests", 114 ":mojo_pnacl_tests",
108 ] 115 ]
109 } 116 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698