Update from https://crrev.com/312398

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")
+import("//testing/test.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",
-      ":mojo_shell_tests_apk",
     ]
   }
 }
 
 group("tests") {
   testonly = true
   deps = [
     ":external_application_unittests",
     ":mojo_shell_tests",
     "//shell/application_manager:mojo_application_manager_unittests",
@@ skipping 282 matching lines @@
     ]
   }
 
   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",
+      "//base:base_java",
       "//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 63 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 += [
       ":jni_headers",
+      ":copy_mojo_shell_test_assets",
+      ":mojo_shell_tests_java",
       "//testing/android:native_test_native_code",
     ]
+
+# TODO(qsr): asset_location = mojo_shell_assets_dir ?

[jamesr, 2015/01/22 00:59:28]

qsr@ = there appears to be a deficiency in the test() template - there's no way
to specify the asset_location for the generated xxx__unittest_apk.

[qsr, 2015/01/22 12:26:04]

 Fixed by https://codereview.chromium.org/862293003/

   }
 }
 
 # GYP version: mojo/mojo.gyp:mojo_shell_test_support
 source_set("test_support") {
   sources = [
     "shell_test_helper.cc",
     "shell_test_helper.h",
   ]
 
@@ skipping 38 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//shell/domain_socket",
       "//shell/domain_socket:tests",
     ]
   }
 }