Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content.

mojo/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.
 
 # Trusted code
 if (!is_nacl) {
   # A simple shell for running untrusted binaries that talk to the Mojo
   # embedder. (No services.)
   executable("monacl_shell") {
     testonly = true
@@ skipping 86 matching lines @@
   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",
+    "//services/nacl:nacl_content_handler_nonsfi_x86",

[Petr Hosek, 2015/09/14 19:13:51]

What if we're building Mojo on ARM (e.g. Android)?

[Sean Klein, 2015/09/15 18:37:50]

Removed "x86" from suffix.
Currently, ARM is not being considered when building Non-SFI NaCl -- I will
include support (along with tests, hopefully) in a future CL.

   ]
 }
 
 group("mojo_pnacl_tests") {
   testonly = true
   deps = [
     ":monacl_test(//native_client/build/toolchain/nacl:newlib_pnacl)",
   ]
 }
 
 group("mojo_nacl_tests") {
   testonly = true
   deps = [
     ":mojo_nacl_tests_untrusted(//native_client/build/toolchain/nacl:clang_newlib_${current_cpu})",
     ":monacl_shell",
     ":monacl_shell_nonsfi_x86",
     ":mojo_pnacl_tests",
   ]
 }