Separate non-SFI NaCl from SFI NaCl.
BUG=https://github.com/domokit/mojo/issues/396
R=phosek@chromium.org
Review URL: https://codereview.chromium.org/1374443002 .
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 75884f4..16c58fb8a 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -13,6 +13,7 @@
# TODO(ncbray): support ASAN once NaCl's GN build is unforked.
mojo_use_nacl = is_linux && !is_asan
+ mojo_use_nacl_nonsfi = is_linux && !is_asan
}
deps = [
":tests",
@@ -44,6 +45,13 @@
"//mojo/nacl:mojo_nacl_tests",
]
}
+
+ if (mojo_use_nacl_nonsfi) {
+ deps += [
+ "//mojo/nacl:mojo_nacl_nonsfi",
+ "//mojo/nacl:mojo_nacl_tests_nonsfi",
+ ]
+ }
}
group("tests") {
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index a15bca2..b8df8b5 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -105,6 +105,11 @@
group("mojo_nacl") {
deps = [
"//services/nacl:nacl_content_handler",
+ ]
+}
+
+group("mojo_nacl_nonsfi") {
+ deps = [
"//services/nacl:nacl_content_handler_nonsfi",
]
}
@@ -180,6 +185,12 @@
deps = [
":mojo_nacl_tests_untrusted(//build/toolchain/nacl:clang_newlib_${current_cpu})",
":monacl_shell",
+ ]
+}
+
+group("mojo_nacl_tests_nonsfi") {
+ testonly = true
+ deps = [
":monacl_shell_nonsfi_x86",
":monacl_test_nonsfi_nexes",
]
