Android: decouple mojo shell from the network service.

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 161 matching lines @@
   if (is_win) {
     deps -= [ "//shell/domain_socket" ]
   }
 
   if (is_android) {
     sources += [
       "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/application:content_handler",
       "//mojo/services/network:lib",
       "//services/gles2",
       "//services/native_viewport:lib",
     ]
@@ skipping 52 matching lines @@
     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 = [
       "//base:base_java",
-      "//net/android:net_java",
     ]
   }
 
   android_resources("resources") {
     resource_dirs = [ "android/apk/res" ]
     custom_package = "org.chromium.mojo_shell_apk"
   }
 
   shared_library("libmojo_shell") {
     sources = [
       "android/library_loader.cc",
       "android/mojo_main.cc",
       "android/mojo_main.h",
     ]
     deps = [
       ":jni_headers",
       ":lib",
       "//mojo/application_manager",
-      "//net",

[jamesr, 2014/12/11 19:16:57]

woohoo!! nicely done

       "//services/native_viewport:lib",
       "//ui/gl",
     ]
   }
 
   mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets"
 
   copy_ex("copy_mojo_shell_assets") {
     clear_dir = true
     dest = mojo_shell_assets_dir
     sources = [
       "$root_out_dir/lib.stripped/libbootstrap.so",
+      "$root_out_dir/network_service.mojo",
       "$root_out_dir/obj/shell/bootstrap_java.dex.jar",
     ]
   }
 
   android_apk("mojo_shell_apk") {
     apk_name = "MojoShell"
 
     android_manifest = "android/apk/AndroidManifest.xml"
 
     native_libs = [ "libmojo_shell.so" ]
@@ skipping 140 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//shell/domain_socket",
       "//shell/domain_socket:tests",
     ]
   }
 }