Shell: Make a separate binary for child processes.

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 28 matching lines @@
   ]
 }
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 if (!mojo_use_prebuilt_mojo_shell) {
   executable("mojo_shell") {
-    sources = [
-      "desktop/main.cc",
-    ]
+    sources = []
 
     deps = [
       ":init",
       ":lib",
       "//base",
       "//base/allocator",
       "//build/config/sanitizers:deps",
       "//mojo/common",
       "//mojo/environment:chromium",
     ]
 
-    if (is_android) {
+    data_deps = [ ":mojo_shell_child" ]
+
+    if (!is_android) {
+      sources += [ "desktop/main.cc" ]
+    } else {
       sources += [
         "android/library_loader.cc",
         "android/main.cc",
         "android/main.h",
       ]
 
       # On android, the executable is also the native library used by the apk.
       # It means dynamic symbols must be preserved and exported.
       ldflags = [ "-Wl,--export-dynamic" ]
 
       deps += [
         ":jni_headers",
         "//services/native_viewport:lib",
         "//shell/application_manager",
         "//ui/gl",
       ]
     }
   }
+
+  executable("mojo_shell_child") {
+    sources = [
+      "child_main.cc",
+    ]
+
+    deps = [
+      # TODO(vtl): Reduce these dependencies (probably mostly in :lib).
+      ":child_controller_bindings",
+      ":init",
+      ":lib",
+      ":native_application_support",
+      "//base",
+      "//base/allocator",
+      "//build/config/sanitizers:deps",
+      "//mojo/common",
+      "//mojo/edk/system",
+      "//mojo/environment:chromium",
+    ]
+  }
 }  # !mojo_use_prebuilt_mojo_shell
 
 executable("mojo_launcher") {
   sources = [
     "launcher_main.cc",
   ]
 
   deps = [
     ":external_application_registrar_bindings",
     ":external_application_registrar_connection",
@@ skipping 30 matching lines @@
     "//shell/application_manager",
   ]
 
   deps = [
     "//base",
   ]
 }
 
 source_set("lib") {
   sources = [
-    "child_main.cc",
-    "child_main.h",
     "child_process_host.cc",
     "child_process_host.h",
     "command_line_util.cc",
     "command_line_util.h",
     "context.cc",
     "context.h",
     "external_application_listener.cc",
     "external_application_listener.h",
     "filename_util.cc",
     "filename_util.h",
@@ skipping 168 matching lines @@
     custom_package = "org.chromium.mojo.shell"
   }
 
   mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets"
   mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets"
 
   copy_ex("copy_mojo_shell_assets") {
     clear_dir = true
     dest = mojo_shell_assets_dir
     sources = [
+      "$root_out_dir/exe.stripped/mojo_shell_child",
       "$root_out_dir/lib.stripped/libbootstrap.so",
       "$root_out_dir/network_service.mojo",
       "$root_out_dir/obj/shell/bootstrap_java.dex.jar",
     ]
   }
 
   copy("copy_mojo_shell") {
     sources = [
       "$root_out_dir/exe.stripped/mojo_shell",
     ]
@@ skipping 73 matching lines @@
     "//base",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/interfaces/application",
     "//shell/domain_socket",
     "//url",
   ]
 }
 
-# GYP version: mojo/mojo.gyp:mojo_shell_tests
 test("mojo_shell_tests") {
   sources = [
     "child_process_host_unittest.cc",
     "command_line_util_unittest.cc",
     "context_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "in_process_native_runner_unittest.cc",
     "native_runner_unittest.cc",
     "shell_test_base.cc",
     "shell_test_base.h",
@@ skipping 12 matching lines @@
     "//testing/gtest",
     "//url",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//services/test_service:bindings",
     "//shell/application_manager",
   ]
 
-  datadeps = [
+  data_deps = [
+    ":mojo_shell_child",
     "//services/test_service:test_app",
     "//services/test_service:test_request_tracker_app",
   ]
 
   if (is_android) {
     sources += [ "android/background_application_loader_unittest.cc" ]
 
     deps += [ ":jni_headers" ]
 
     apk_deps = [
       ":copy_mojo_shell_test_assets",
       ":mojo_shell_tests_java",
     ]
 
     apk_asset_location = mojo_shell_test_assets_dir
   }
 }
 
-# GYP version: mojo/mojo.gyp:mojo_shell_test_support
 source_set("test_support") {
   sources = [
     "shell_test_helper.cc",
     "shell_test_helper.h",
   ]
 
   deps = [
     ":init",
     ":lib",
     "//base",
@@ skipping 58 matching lines @@
     "//mojo/public/cpp/system:system",
     "//mojo/services/http_server/public/cpp",
     "//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//shell/test:bindings",
     ":embed_pingable",
   ]
 
   data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }