Add required deps to third_party/android_support_test_runner

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index a989912bf6f0b84477b323a440951c732d2f020c..96a610a56d9cd6248b0cfd7ae4c5750bca24e888 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1876,6 +1876,11 @@ if (enable_java_templates) {
     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))
 
@@ -2027,6 +2032,9 @@ if (enable_java_templates) {
             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 ]
       }
@@ -2124,6 +2132,10 @@ if (enable_java_templates) {
   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
@@ -2299,6 +2311,7 @@ if (enable_java_templates) {
       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.