Separate non-SFI NaCl from SFI NaCl.

mojo/BUILD.gn

Index: mojo/BUILD.gn
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 75884f488b8eeefc99c354413441fa9e96347990..16c58fb8acf90c74e81fcc6302cf4310064c0c76 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -13,6 +13,7 @@ group("mojo") {
 
     # 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 @@ group("mojo") {
       "//mojo/nacl:mojo_nacl_tests",
     ]
   }
+
+  if (mojo_use_nacl_nonsfi) {
+    deps += [
+      "//mojo/nacl:mojo_nacl_nonsfi",
+      "//mojo/nacl:mojo_nacl_tests_nonsfi",
+    ]
+  }
 }
 
 group("tests") {