Launch nexes from mojo_shell.

shell/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/config/ui.gni")
+import("//mojo/nacl/config.gni")
 import("//mojo/public/mojo.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
 assert(!is_component_build)
 
+config("gate_nacl") {

[jamesr, 2015/02/03 05:15:41]

it's not worth adding a new config that will be used in only one place. just set
the define directly

[Nick Bray (chromium), 2015/02/03 19:06:31]

Done.

+  if (mojo_use_nacl) {
+    defines = [ "MOJO_USE_NACL=1" ]
+  } else {
+    defines = [ "MOJO_USE_NACL=0" ]
+  }
+}
+
 group("shell") {
   testonly = true
 
   deps = [
     ":mojo_shell",
     ":tests",
   ]
 
   if (!is_win) {
     deps += [ ":mojo_launcher" ]
@@ skipping 160 matching lines @@
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/interfaces/application",
     "//mojo/services/network/public/interfaces",
     "//shell/application_manager",
     "//shell/domain_socket",
     "//services/tracing:bindings",
     "//url",
   ]
 
+  configs += [ ":gate_nacl" ]
+  if (mojo_use_nacl) {
+    sources += [

[jamesr, 2015/02/03 05:15:41]

as in defines += [ .. ] in here (and if you must have the =0 do it in the false
case, although if the #ifs are set up correctly you should not need to)

[Nick Bray (chromium), 2015/02/03 19:06:31]

Done, although I generally believe using -Wundef is the better choice.

+      "nacl/nacl_service_runner.cc",
+      "nacl/nacl_service_runner.h",
+    ]
+
+    deps += [ "//mojo/nacl:monacl_sel" ]
+
+    data_deps = [ "//mojo/nacl:irt_mojo(//native_client/build/toolchain/nacl:irt_${cpu_arch})" ]
+  }
+
   if (is_win) {
     deps -= [ "//shell/domain_socket" ]
   }
 
   if (is_android) {
     sources += [
       "android/android_handler.cc",
       "android/android_handler.h",
       "android/android_handler_loader.cc",
       "android/android_handler_loader.h",
@@ skipping 294 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//shell/domain_socket",
       "//shell/domain_socket:tests",
     ]
   }
 }