Adding nonsfi content handler

mojo/nacl/BUILD.gn

Index: mojo/nacl/BUILD.gn
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index 496d1d65d6e42bd085c967dca20b816d99651862..4c5e2e9c312a1c7236dc3c807bdc42c2f432ab7e 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -26,10 +26,8 @@ if (!is_nacl) {
       "monacl_shell_nonsfi.cc",
     ]
     deps = [
+      ":irt_mojo_nonsfi",
       "//mojo/edk/system",
-      "//mojo/public/c/system",
-      "//mojo/public/platform/nacl:mojo_irt_header",
-      "//native_client/src/nonsfi/irt:irt_interfaces",
       "//native_client/src/nonsfi/loader:elf_loader",
     ]
   }
@@ -74,9 +72,23 @@ if (is_nacl) {
   }
 }
 
+source_set("irt_mojo_nonsfi") {

[Mark Seaborn, 2015/09/02 20:27:15]

Nit: Doesn't source_set mean this would get compiled twice, for each target that
uses it?  If so, making this a library would be better.

[Sean Klein, 2015/09/02 22:36:19]

Switched to static_library.

+  sources = [
+    "irt_mojo_nonsfi.cc",
+    "irt_mojo_nonsfi.h",
+  ]
+
+  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",
+    "//services/nacl:nacl_content_handler_nonsfi",
   ]
 }