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 1873 matching lines @@
     _chromium_code = false
     if (defined(invoker.chromium_code)) {
       _chromium_code = invoker.chromium_code
     }
 
     _supports_android = true
     if (defined(invoker.supports_android)) {
       _supports_android = invoker.supports_android
     }
 
+    _requires_android =
+        defined(invoker.requires_android) && invoker.requires_android
+
     _enable_errorprone = use_errorprone_java_compiler
     if (!_chromium_code) {
       _enable_errorprone = false
     } else if (defined(invoker.enable_errorprone)) {
       _enable_errorprone = invoker.enable_errorprone
     }
 
     _provider_configurations = []
     if (defined(invoker.provider_configurations)) {
       _provider_configurations = invoker.provider_configurations
@@ skipping 103 matching lines @@
       } else {
         args +=
             [ "--classpath=@FileArg($_rebased_build_config:javac:classpath)" ]
       }
       if (_enable_incremental_javac) {
         args += [ "--incremental" ]
         deps += [ "//third_party/jmake($default_toolchain)" ]
         inputs += [ "$root_build_dir/bin/jmake" ]
         outputs += [ "${_javac_jar_path}.pdb" ]
       }
-      if (_supports_android) {
+      if (_requires_android) {
         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" ]
       }
+      if (_supports_android) {
+        args += [ "--java-version=1.7" ]
+      }
       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 250 matching lines @@
       jar_path = _jar_path
       build_config = _build_config
       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
+      requires_android = _requires_android
       emma_instrument = _emma_instrument
       deps = _accumulated_deps
     }
     _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" ]
@@ skipping 310 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }