Run shell tests on android.

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.
 assert(!is_component_build)
 
 group("shell") {
   testonly = true
 
   deps = [
     ":mojo_shell",
     ":tests",
   ]
 
   if (!is_win) {
     deps += [ ":mojo_launcher" ]
   }
 
   if (is_android) {
-    deps += [ ":mojo_shell_apk" ]
+    deps += [
+      ":mojo_shell_apk",
+      ":mojo_shell_tests_apk",
+    ]
   }
 }
 
 group("tests") {
   testonly = true
   deps = [
     ":external_application_unittests",
     ":mojo_shell_tests",
   ]
 }
@@ skipping 186 matching lines @@
   # 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/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/Bootstrap.java",
       "android/apk/src/org/chromium/mojo/shell/MojoMain.java",
+      "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java",
     ]
     jni_package = "mojo/shell"
   }
 
   android_library("bootstrap_java") {
     java_files = [ "android/apk/src/org/chromium/mojo/shell/Bootstrap.java" ]
 
     deps = [
       "//base:base_java",
     ]
@@ skipping 37 matching lines @@
       "//base:base_java",
     ]
   }
 
   android_resources("resources") {
     resource_dirs = [ "android/apk/res" ]
     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/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",
     ]
     outputs = [
       "$root_out_dir/lib.stripped/libmojo_shell.so",
     ]
   }
 
+  copy_ex("copy_mojo_shell_test_assets") {
+    clear_dir = true
+    dest = mojo_shell_test_assets_dir
+    sources = [
+      "$root_out_dir/test_app.mojo",
+      "$root_out_dir/test_request_tracker_app.mojo",
+    ]
+  }
+
   android_apk("mojo_shell_apk") {
     apk_name = "MojoShell"
 
     android_manifest = "android/apk/AndroidManifest.xml"
 
     native_libs = [ "libmojo_shell.so" ]
 
     asset_location = mojo_shell_assets_dir
 
     deps = [
       ":copy_mojo_shell",
       ":copy_mojo_shell_assets",
       ":java",
       ":resources",
       "//services/native_viewport:native_viewport_java",
     ]
   }
+
+  android_library("mojo_shell_tests_java") {
+    java_files =
+        [ "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java" ]
+
+    deps = [
+      ":java",
+      "//base:base_java",
+    ]
+  }
+
+  unittest_apk("mojo_shell_tests_apk") {
+    unittests_dep = ":mojo_shell_tests"
+
+    asset_location = mojo_shell_test_assets_dir
+
+    deps = [
+      unittests_dep,
+      ":copy_mojo_shell_test_assets",
+      ":mojo_shell_tests_java",
+    ]
+  }
 }
 
 mojom("app_child_process_bindings") {
   sources = [
     "app_child_process.mojom",
   ]
 }
 
 mojom("external_application_registrar_bindings") {
   sources = [
@@ skipping 30 matching lines @@
 # GYP version: mojo/mojo.gyp:mojo_shell_tests
 test("mojo_shell_tests") {
   sources = [
     "child_process_host_unittest.cc",
     "command_line_util_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "dynamic_application_loader_unittest.cc",
     "in_process_dynamic_service_runner_unittest.cc",
     "mojo_url_resolver_unittest.cc",
     "shell_test_base.cc",
+    "shell_test_base_android.cc",
     "shell_test_base.h",
     "shell_test_base_unittest.cc",
     "shell_test_main.cc",
   ]
 
   deps = [
     ":in_process_dynamic_service_runner",
     ":lib",
     "//base",
     "//base:i18n",
@@ skipping 11 matching lines @@
 
   datadeps = [
     "//services/test_service:test_app",
     "//services/test_service:test_request_tracker_app",
   ]
 
   if (is_android) {
     sources += [ "android/background_application_loader_unittest.cc" ]
 
     deps += [
-      # TODO(GYP):
-      #'../testing/android/native_test.gyp:native_test_native_code',
+      ":jni_headers",
+      "//testing/android:native_test_native_code",
     ]
   }
 }
 
 # GYP version: mojo/mojo.gyp:mojo_shell_test_support
 source_set("test_support") {
   sources = [
     "shell_test_helper.cc",
     "shell_test_helper.h",
   ]
@@ skipping 39 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//shell/domain_socket",
       "//shell/domain_socket:tests",
     ]
   }
 }