Refactored Non-SFI and SFI NaCl into separate directories.

mojo/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/module_args/mojo.gni")
 import("//mojo/public/mojo.gni")
 
 group("mojo") {
   # Meta-target, don't link into production code.
   testonly = true
@@ skipping 23 matching lines @@
   if (is_linux && mojo_use_go) {
     deps += [ "//mojo/go" ]
   }
 
   if (is_linux && !is_fnl) {
     deps += [ "//mojo/python" ]
   }
 
   if (mojo_use_nacl) {
     deps += [
-      "//mojo/nacl:mojo_nacl",
-      "//mojo/nacl:mojo_nacl_tests",
+      "//mojo/nacl/sfi:mojo_nacl",
+      "//mojo/nacl/sfi:mojo_nacl_tests",
     ]
   }
 
   if (mojo_use_nacl_nonsfi) {
     deps += [
-      "//mojo/nacl:mojo_nacl_nonsfi",
-      "//mojo/nacl:mojo_nacl_tests_nonsfi",
+      "//mojo/nacl/nonsfi:mojo_nacl_nonsfi",
+      "//mojo/nacl/nonsfi:mojo_nacl_tests_nonsfi",
     ]
   }
 }
 
 group("tests") {
   testonly = true
   deps = [
     "//mojo/common:mojo_common_unittests",
     "//mojo/edk/system:tests",
     "//mojo/edk/test:public_tests",
     "//mojo/dart/embedder/test:dart_unittests",
     "//mojo/public/cpp/bindings/tests:versioning_apptests",
     "//mojo/services/view_manager/cpp/tests:mojo_view_manager_lib_unittests",
     "//mojo/tests:mojo_task_tracker_perftests",
     "//mojo/tools:message_generator",
     "//mojo/gles2:mgl_unittests",
     "//mojo/gpu:apptests",
     "//mojo/services/files/c:apptests",
     "//mojo/services/files/cpp:files_impl_apptests",
   ]
 
   if (is_linux || is_android) {
     deps += [ "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests" ]
   }
 
   if (mojo_use_prebuilt_network_service) {
     deps += [ "//mojo/public/tools:copy_network_service_apptests" ]
   }
 }