Refactored Non-SFI and SFI NaCl into separate directories.

mojo/nacl/nonsfi/BUILD.gn

Index: mojo/nacl/nonsfi/BUILD.gn
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/nonsfi/BUILD.gn
similarity index 68%
copy from mojo/nacl/BUILD.gn
copy to mojo/nacl/nonsfi/BUILD.gn
index fb658bfed3d3c73b5a14d61b64a7207d3ea4afdc..6f855385d6573d63f215ebad895664749e6b4efa 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/nonsfi/BUILD.gn
@@ -6,21 +6,6 @@
 if (!is_nacl) {
   # A simple shell for running untrusted binaries that talk to the Mojo
   # embedder. (No services.)
-  executable("monacl_shell") {
-    testonly = true
-    sources = [
-      "monacl_shell.cc",
-    ]
-    deps = [
-      "//base:base",
-      "//mojo/edk/system:system",
-      "//nacl_bindings:monacl_sel",
-    ]
-
-    data_deps =
-        [ "//nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
-  }
-
   if (current_cpu == "x86" || current_cpu == "arm") {
     # Non-SFI NaCl currently supports x86-32 and ARMv7, but not anything 64-bit.
     # Additionally, PNaCl pexes assume 32-bit pointers.
@@ -52,43 +37,6 @@ group("monacl_shell_nonsfi_x86") {
   }
 }
 
-# Untrusted code
-if (is_nacl) {
-  # Unit test for the Mojo public API.
-  executable("monacl_test") {
-    testonly = true
-    sources = [
-      "//mojo/public/cpp/system/tests/core_unittest.cc",
-      "//mojo/public/cpp/system/tests/macros_unittest.cc",
-    ]
-    deps = [
-      "//mojo/public/c/system/tests:tests",
-      "//mojo/public/cpp/system:system",
-      "//mojo/public/platform/nacl:mojo",
-      "//testing/gtest:gtest",
-      "//testing/gtest:gtest_main",
-    ]
-  }
-
-  group("mojo_nacl_tests_untrusted") {
-    testonly = true
-    deps = [
-      ":monacl_test",
-      "//examples/apptest",
-      "//examples/wget",
-      "//services/clipboard",
-      "//services/clipboard:apptests",
-      "//services/files:apptests",
-      "//services/http_server",
-      "//services/http_server:apptests",
-      "//services/view_manager:mojo_view_manager_client_apptests",
-      "//services/view_manager:view_manager_service_apptests",
-      "//services/window_manager:window_manager_apptests",
-      "//shell:apptests",
-    ]
-  }
-}
-
 static_library("irt_mojo_nonsfi") {
   sources = [
     "irt_mojo_nonsfi.cc",
@@ -104,12 +52,6 @@ static_library("irt_mojo_nonsfi") {
   ]
 }
 
-group("mojo_nacl") {
-  deps = [
-    "//services/nacl:nacl_content_handler",
-  ]
-}
-
 group("mojo_nacl_nonsfi") {
   deps = [
     "//services/nacl:nacl_content_handler_nonsfi",
@@ -119,7 +61,7 @@ group("mojo_nacl_nonsfi") {
 group("mojo_pnacl_tests") {
   testonly = true
   deps = [
-    ":monacl_test(//build/toolchain/nacl:newlib_pnacl)",
+    "//mojo/nacl:monacl_test(//build/toolchain/nacl:newlib_pnacl)",
   ]
 }
 
@@ -193,14 +135,6 @@ group("monacl_test_nonsfi_nexes") {
   ]
 }
 
-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 = [