Add required deps to third_party/android_support_test_runner

BUG=627916

Review-Url: https://codereview.chromium.org/2142413004
Cr-Original-Commit-Position: refs/heads/master@{#414150}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 24da3c36fd807a0003bece9c352567ad637f810e

android/gyp/javac.py

@@ -256,6 +256,9 @@ def _ParseOptions(argv):
       default=[],
       help='Boot classpath for javac. If this is specified multiple times, '
       'they will all be appended to construct the classpath.')
+  parser.add_option(
+      '--java-version',
+      help='Java language version to use in -source and -target args to javac.')
   parser.add_option(
       '--classpath',
       action='append',
@@ -379,10 +382,14 @@ def main(argv):
 
   if options.bootclasspath:
     javac_cmd.extend([
-        '-bootclasspath', ':'.join(options.bootclasspath),
-        '-source', '1.7',
-        '-target', '1.7',
-        ])
+      '-bootclasspath', ':'.join(options.bootclasspath)
+    ])
+
+  if options.java_version:
+    javac_cmd.extend([
+      '-source', options.java_version,
+      '-target', options.java_version,
+    ])
 
   if options.chromium_code:
     javac_cmd.extend(['-Xlint:unchecked', '-Xlint:deprecation'])

config/android/internal_rules.gni

@@ -1892,6 +1892,9 @@ if (enable_java_templates) {
       _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
@@ -2015,7 +2018,7 @@ if (enable_java_templates) {
         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
@@ -2028,6 +2031,9 @@ if (enable_java_templates) {
             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 ]
       }
@@ -2298,6 +2304,7 @@ if (enable_java_templates) {
       srcjars = _srcjars
       chromium_code = _chromium_code
       supports_android = _supports_android
+      requires_android = _requires_android
       emma_instrument = _emma_instrument
       deps = _accumulated_deps
     }