Add required deps to third_party/android_support_test_runner

build/android/gyp/javac.py

Index: build/android/gyp/javac.py
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index c8425bd3aa578880d0b88f46440569c97670b589..f475043c6143a400e5028bf49543df01a37f8a0e 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -257,6 +257,11 @@ def _ParseOptions(argv):
       help='Boot classpath for javac. If this is specified multiple times, '
       'they will all be appended to construct the classpath.')
   parser.add_option(

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

If you take my suggestions to internal_rules.gni, you shouldn't have to change
this file at all.

[aluo, 2016/08/23 00:37:57]

There's logic in this script to set -src and -target to java 1.7 instead of
whatever is on the host if a --bootclasspath is present.  We still need this to
be set otherwise on my machine which is using java 1.8, I get errors related to
javac versions when creating the dex file.  So that's why I made it a separate
option.

+      '--use_host_bootclasspath',

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

--use-host-bootclasspath

[aluo, 2016/08/23 00:37:57]

Acknowledged.

+      type='int',

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

Remove type='int'

Instead just action="store_true". Then if --use-host-bootclasspath is specified
the varible args.use_host_bootclasspath will just be true.

[aluo, 2016/08/23 00:37:57]

Acknowledged.

+      help='Do not use custom bootclasspath even if bootclasspath is '
+      'specified.')

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

indenting (should be aligned with text above)

[aluo, 2016/08/23 00:37:57]

Acknowledged.

+  parser.add_option(
       '--classpath',
       action='append',
       help='Classpath for javac. If this is specified multiple times, they '
@@ -378,8 +383,11 @@ def main(argv):
   ))
 
   if options.bootclasspath:
+    if not options.use_host_bootclasspath:
+      javac_cmd.extend([
+        '-bootclasspath', ':'.join(options.bootclasspath)
+      ])
     javac_cmd.extend([
-        '-bootclasspath', ':'.join(options.bootclasspath),
         '-source', '1.7',
         '-target', '1.7',
         ])