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

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/public/mojo.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//mojo/tools/embed/rules.gni")
 import("//testing/test.gni")
@@ skipping 65 matching lines @@
              ]
 
       data_deps = shell_common_data_deps
     }
   } else {
     executable("mojo_shell") {
       sources = [
         "desktop/main.cc",
       ]
 
-      deps = shell_common_deps
+      deps = shell_common_deps + [ ":mojo_shell_child_x86" ]
 
       data_deps = shell_common_data_deps
     }
   }
 
   executable("mojo_shell_child") {
     sources = [
       "child_main.cc",
     ]
 
     deps = [
       ":child_controller_bindings",
       ":common_lib",
       "//base",
       "//base/allocator",
       "//build/config/sanitizers:deps",
       "//mojo/edk/system",
       "//mojo/environment:chromium",
       "//mojo/message_pump",
     ]
   }
+
+  group("mojo_shell_child_x86") {

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

Ditto here.

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

Naming "mojo_shell_child_32_bit", since "mojo_shell_child" is already taken and
may imply the 64 bit version.

+    # This group is required to run any 32-bit child process.
+    deps = []
+    if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) {
+      deps = [
+        ":mojo_shell_child(//build/toolchain/linux:clang_x86)",

[Mark Seaborn, 2015/09/14 18:38:58]

Nit: Shouldn't this come with the same warning as you added in
https://codereview.chromium.org/1327913004?

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

Done.

+      ]
+    }
+  }
 }  # !mojo_use_prebuilt_mojo_shell
 
 # Files used both by mojo_shell and mojo_shell_child (and tests).
 source_set("common_lib") {
   sources = [
     "child_switches.cc",
     "child_switches.h",
     "init.cc",
     "init.h",
   ]
@@ skipping 493 matching lines @@
       "${root_out_dir}/libmojo_shell.so",
     ]
   } else {
     sources += [ "${root_out_dir}/mojo_shell" ]
   }
 
   outputs = [
     "${root_out_dir}/symbols/{{source_file_part}}",
   ]
 }