Refactored Non-SFI and SFI NaCl into separate directories.

services/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.
 
 import("//mojo/public/mojo_application.gni")
 
 # Trusted code
 if (!is_nacl) {
   mojo_native_application("nacl_content_handler") {
     sources = [
       "content_handler_main.cc",
     ]
 
     deps = [
       "//base",
       "//mojo/application:application",
       "//mojo/application:content_handler",
       "//mojo/data_pipe_utils",
       "//mojo/message_pump",
       "//mojo/public/platform/native:system_impl_private",
       "//mojo/services/network/public/interfaces",
-      "//nacl_bindings:monacl_sel",
+      "//mojo/nacl/sfi/nacl_bindings:monacl_sel",
       "//url",
     ]
 
-    data_deps =
-        [ "//nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
+    data_deps = [ "//mojo/nacl/sfi/nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
   }
 
   if (current_cpu == "x86" || current_cpu == "arm") {
     # Non-SFI NaCl can only be executed by a 32-bit process, so our
     # content handler must be built and launched as a 32-bit process as well.
     mojo_native_application("nacl_content_handler_nonsfi_32_bit") {
       sources = [
         "content_handler_main_nonsfi.cc",
       ]
 
       deps = [
         "//base",
         "//mojo/application:application",
         "//mojo/application:content_handler",
         "//mojo/data_pipe_utils",
         "//mojo/message_pump",
-        "//mojo/nacl:irt_mojo_nonsfi",
+        "//mojo/nacl/nonsfi:irt_mojo_nonsfi",
         "//mojo/public/cpp/application:application",
         "//native_client/src/nonsfi/loader:elf_loader",
       ]
     }
 
     # Copy to the root build directory so that the '#!' prefix line for invoking
     # our content handler can simply be "mojo:nacl_content_handler_nonsfi".
     copy("nacl_content_handler_nonsfi_copy") {
       sources = [
         "${root_out_dir}/nacl_content_handler_nonsfi_32_bit.mojo",
@@ skipping 15 matching lines @@
   if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) {
     # The toolchain is hardcoded as 32-bit clang here -- although it must
     # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would
     # be defined as the 32 bit variant of whatever is being used (be it clang,
     # gcc, or something else).
     deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x86)" ]
   } else {
     deps += [ ":nacl_content_handler_nonsfi_copy" ]
   }
 }