Separate non-SFI NaCl from SFI NaCl.

mojo/nacl/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Trusted code
 if (!is_nacl) {
   # A simple shell for running untrusted binaries that talk to the Mojo
   # embedder. (No services.)
   executable("monacl_shell") {
     testonly = true
@@ skipping 87 matching lines @@
   deps = [
     "//mojo/public/c/system",
     "//mojo/public/platform/nacl:mojo_irt_header",
     "//native_client/src/nonsfi/irt:irt_interfaces",
   ]
 }
 
 group("mojo_nacl") {
   deps = [
     "//services/nacl:nacl_content_handler",
+  ]
+}
+
+group("mojo_nacl_nonsfi") {
+  deps = [
     "//services/nacl:nacl_content_handler_nonsfi",
   ]
 }
 
 group("mojo_pnacl_tests") {
   testonly = true
   deps = [
     ":monacl_test(//build/toolchain/nacl:newlib_pnacl)",
   ]
 }
@@ skipping 55 matching lines @@
     ":translate_mojo_pnacl_tests_to_native",
     ":prepend_shebang_to_nexe",
   ]
 }
 
 group("mojo_nacl_tests") {
   testonly = true
   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",
   ]
 }