Moves android specific code into android directory

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 142 matching lines @@
     "mojo_url_resolver.cc",
     "mojo_url_resolver.h",
     "out_of_process_dynamic_service_runner.cc",
     "out_of_process_dynamic_service_runner.h",
     "switches.cc",
     "switches.h",
     "task_runners.cc",
     "task_runners.h",
     "test_child_process.cc",
     "test_child_process.h",
-    "ui_application_loader_android.cc",
-    "ui_application_loader_android.h",
   ]
 
   deps = [
     ":app_child_process_bindings",
     ":external_application_registrar_bindings",
     ":init",
     ":in_process_dynamic_service_runner",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
@@ skipping 10 matching lines @@
     "//services/tracing:bindings",
     "//url",
   ]
 
   if (is_win) {
     deps -= [ "//shell/domain_socket" ]
   }
 
   if (is_android) {
     sources += [
+      "android/android_handler.cc",
       "android/android_handler.h",
-      "android/android_handler.cc",
+      "android/android_handler_loader.cc",
       "android/android_handler_loader.h",
-      "android/android_handler_loader.cc",
+      "android/ui_application_loader_android.cc",
+      "android/ui_application_loader_android.h",
     ]
 
     deps += [
       ":jni_headers",
       ":run_android_application_function",
       "//mojo/application:content_handler",
       "//services/gles2",
       "//services/native_viewport:lib",
     ]
   }
 
   # 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
   # so we can enable checking for the rest of the targets in this file.
   # TODO: Might be better to split the files with OS-specific includes out to a
   # separate source_set so we can leave checking on for the rest of the target.
   check_includes = false
 }
 
 if (is_android) {
   generate_jni("jni_headers") {
     sources = [
       "android/apk/src/org/chromium/mojo_shell_apk/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo_shell_apk/Bootstrap.java",
       "android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java",
     ]
-    jni_package = "mojo"
+    jni_package = "mojo/shell"
   }
 
   android_library("bootstrap_java") {
     java_files =
         [ "android/apk/src/org/chromium/mojo_shell_apk/Bootstrap.java" ]
 
     deps = [
       "//base:base_java",
     ]
 
@@ skipping 208 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//shell/domain_socket",
       "//shell/domain_socket:tests",
     ]
   }
 }