[Android] Fix generated scripts for junit tests.

build/android/test_runner.gypi

Index: build/android/test_runner.gypi
diff --git a/build/android/test_runner.gypi b/build/android/test_runner.gypi
index 33b51348b07310e9376a24d6d6ca313ae0d35aff..46da83a62198cb4e80f7e2b49f3dfb163ea035db 100644
--- a/build/android/test_runner.gypi
+++ b/build/android/test_runner.gypi
@@ -28,6 +28,16 @@
 #   'includes': ['path/to/this/gypi/file'],
 # }
 #
+# {
+#   'target_name': 'junit_test',
+#   'type': 'none',
+#   'variables': {
+#     'test_type': 'junit',  # string
+#     'test_suite_name': 'junit_test'  # string
+#   },
+#   'includes': ['path/to/this/gypi/file'],
+# }
+#
 
 {
   'variables': {
@@ -55,6 +65,10 @@
           }],
         ],
       }],
+      ['test_type == "junit"', {
+        'test_runner_args': ['--test-suite', '<(test_suite_name)'],
+        'script_name': 'run_<(test_suite_name)',

[jbudorick, 2016/02/09 00:06:47]

we should be able to use _target_name instead of test_suite_name. gtest uses the
latter because the suite name differs from the target name; that shouldn't be
the case for junit.

[mikecase (-- gone --), 2016/02/09 00:54:34]

Done

+      }],
       ['additional_apks != []', {
         'test_runner_args': ['--additional-apk-list', '>(additional_apks)'],
       }],