Add required deps to third_party/android_support_test_runner

build/config/android/internal_rules.gni

 # 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/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # These identify targets that have .build_config files (except for android_apk,
@@ skipping 1858 matching lines @@
   #   java_sources_file: Path to file containing list of files to compile.
   #   chromium_code: If true, enable extra warnings.
   #   srcjar_deps: List of srcjar dependencies. The .java files contained in the
   #     dependencies srcjar outputs will be compiled and added to the output jar.
   #   jar_path: Use this to explicitly set the output jar path. Defaults to
   #     "${target_gen_dir}/${target_name}.jar.
   template("compile_java") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
+    _use_host_bootclasspath = false
+    if (defined(invoker.use_host_bootclasspath)) {
+      _use_host_bootclasspath = invoker.use_host_bootclasspath
+    }
+
     assert(defined(invoker.build_config))
     assert(defined(invoker.jar_path))
 
     _build_config = invoker.build_config
 
     _chromium_code = false
     if (defined(invoker.chromium_code)) {
       _chromium_code = invoker.chromium_code
     }
 
@@ skipping 129 matching lines @@
         if (defined(invoker.alternative_android_sdk_ijar)) {
           deps += [ invoker.alternative_android_sdk_ijar_dep ]
           _android_sdk_ijar = invoker.alternative_android_sdk_ijar
         } else {
           deps += [ "//build/android:android_ijar" ]
           _android_sdk_ijar = "$root_out_dir/lib.java/android.interface.jar"
         }
         inputs += [ _android_sdk_ijar ]
         _rebased_android_sdk_ijar =
             rebase_path(_android_sdk_ijar, root_build_dir)
         args += [ "--bootclasspath=$_rebased_android_sdk_ijar" ]

[mikecase (-- gone --), 2016/08/22 23:42:17]

I would probably just add a flag that causes this not to be set.

if not android_use_host_jdk:
   args += [ "--bootclasspath=$_rebased_android_sdk_ijar" ]


 or something

       }
+      if (_use_host_bootclasspath) {
+        args += [ "--use_host_bootclasspath=1" ]
+      }
       foreach(e, _manifest_entries) {
         args += [ "--manifest-entry=" + e ]
       }
       if (_chromium_code) {
         args += [ "--chromium-code=1" ]
       }
       if (_enable_errorprone) {
         deps += [ "//third_party/errorprone:chromium_errorprone" ]
         args += [
           "--use-errorprone-path",
@@ skipping 77 matching lines @@
         public_deps += [ ":$_emma_instr_target_name" ]
       } else {
         public_deps += [ ":$_process_prebuilt_target_name" ]
       }
     }
   }
 
   template("java_library_impl") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
+    _use_host_bootclasspath = false
+    if (defined(invoker.use_host_bootclasspath)) {
+      _use_host_bootclasspath = invoker.use_host_bootclasspath
+    }
     _accumulated_deps = []
     if (defined(invoker.deps)) {
       _accumulated_deps = invoker.deps
     }
 
     assert(defined(invoker.java_files) || defined(invoker.srcjars) ||
            defined(invoker.srcjar_deps))
     _base_path = "$target_gen_dir/$target_name"
 
     # Jar files can be needed at runtime (by Robolectric tests or java binaries),
@@ skipping 155 matching lines @@
       java_files = _java_files
       if (_java_files != []) {
         java_sources_file = _java_sources_file
       }
       srcjar_deps = _srcjar_deps
       srcjars = _srcjars
       chromium_code = _chromium_code
       supports_android = _supports_android
       emma_instrument = _emma_instrument
       deps = _accumulated_deps
+      use_host_bootclasspath = _use_host_bootclasspath
     }
     _accumulated_deps += [ ":$_compile_java_target" ]
     assert(_accumulated_deps != [])  # Mark used.
 
     if (defined(invoker.main_class)) {
       # Targets might use the generated script while building, so make it a dep
       # rather than a data_dep.
       _final_deps += [ ":${_template_name}__java_binary_script" ]
       java_binary_script("${_template_name}__java_binary_script") {
         forward_variables_from(invoker,
@@ skipping 308 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }