Multiprocess test client: Android child process launcher rework.

testing/test.gni

 # Copyright 2015 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.
 
 # ==============================================================================
 # TEST SETUP
 # ==============================================================================
 
+if (is_android) {
+  import("//build/config/android/config.gni")
+  import("//build/config/android/rules.gni")
+  import("//build/config/sanitizers/sanitizers.gni")
+}
+
 # Define a test as an executable (or apk on Android) with the "testonly" flag
 # set.
 # Variable:
 #   use_raw_android_executable: Use executable() rather than android_apk().
 #   use_native_activity: Test implements ANativeActivity_onCreate().
 template("test") {
   if (is_android) {
-    import("//build/config/android/config.gni")
-    import("//build/config/android/rules.gni")
-    import("//build/config/sanitizers/sanitizers.gni")
-
     _use_raw_android_executable = defined(invoker.use_raw_android_executable) &&
                                   invoker.use_raw_android_executable
 
     # output_name is used to allow targets with the same name but in different
     # packages to still produce unique runner scripts.
     _output_name = invoker.target_name
     if (defined(invoker.output_name)) {
       _output_name = invoker.output_name
     }
 
@@ skipping 78 matching lines @@
       }
       unittest_apk(_apk_target) {
         forward_variables_from(invoker, _apk_specific_vars + [ "deps" ])
         shared_library = ":$_library_target"
         apk_name = invoker.target_name
         if (defined(invoker.output_name)) {
           apk_name = invoker.output_name
           install_script_name = "install_${invoker.output_name}"
         }
 
+        # Add the Java classes so that each target does not have to do it.
+        deps += [ "//base/test:test_support_java" ]
+
         # TODO(agrieve): Remove this data_dep once bots don't build the _apk
         #     target (post-GYP).
         # It's a bit backwards for the apk to depend on the runner script, since
         # the apk is conceptually a runtime_dep of the script. However, it is
         # currently necessary because the bots build this _apk target directly
         # rather than the group() below.
         data_deps = [
           ":$_test_runner_target",
         ]
       }
@@ skipping 156 matching lines @@
 }
 
 # Test defaults.
 set_defaults("test") {
   if (is_android) {
     configs = default_shared_library_configs
   } else {
     configs = default_executable_configs
   }
 }