Android handler: inject the application loading part from the shell .so.

mojo/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/tools/bindings/mojom.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
@@ skipping 146 matching lines @@
       "android/android_handler.h",
       "android/android_handler.cc",
       "android/android_handler_loader.h",
       "android/android_handler_loader.cc",
       "network_application_loader.cc",
       "network_application_loader.h",
     ]
 
     deps += [
       ":jni_headers",
+      ":run_android_application_function",
       "//mojo/services/gles2",
       "//mojo/services/native_viewport:lib",
       "//mojo/services/network:lib",
       "//mojo/application:content_handler",
     ]
   }
 
   # This target includes some files behind #ifdef OS... guards. Since gn is not
   # smart enough to understand preprocess includes, it does complains about
   # these includes when not using the build files for that OS. Suppress checking
@@ skipping 25 matching lines @@
     dex_path = "$target_out_dir/bootstrap_java.dex.jar"
   }
 
   shared_library("bootstrap") {
     sources = [
       "android/bootstrap.cc",
     ]
     deps = [
       ":jni_headers",
       ":lib",
+      ":run_android_application_function",
       "//base",
-      "//mojo/environment:chromium",
     ]
   }
 
+  # Shared header between the bootstrap and the main shell .so.
+  source_set("run_android_application_function") {
+    sources = [
+      "android/run_android_application_function.h",
+    ]
+  }
+
   android_library("java") {
     java_files = [
       "android/apk/src/org/chromium/mojo_shell_apk/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo_shell_apk/FileHelper.java",
       "android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java",
       "android/apk/src/org/chromium/mojo_shell_apk/MojoShellActivity.java",
       "android/apk/src/org/chromium/mojo_shell_apk/MojoShellApplication.java",
     ]
 
     deps = [
@@ skipping 185 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//mojo/shell/domain_socket",
       "//mojo/shell/domain_socket:tests",
     ]
   }
 }