[Android] Fix generated scripts for junit tests.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 929a3e42d52114297ce7715f90c31913b3fd720c..e92a9df5afbf926bf6fd729380d7f3ce690bff6b 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1506,13 +1506,16 @@
             '../testing/android/junit/junit_test.gyp:junit_test_support',
           ],
           'variables': {
-             'main_class': 'org.chromium.testing.local.JunitTestMain',
-             'src_paths': [
-               '../base/android/junit/',
-               '../base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java',
-             ],
+            'main_class': 'org.chromium.testing.local.JunitTestMain',
+            'src_paths': [
+              '../base/android/junit/',
+              '../base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java',
+            ],
+            'test_type': 'junit',
+            'test_suite_name': 'base_junit_tests',
            },

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

nit: indentation

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

I thought I fixed the indentation here?

[jbudorick, 2016/02/09 01:22:21]

this brace appears to be off by one?

did I mention "nit"? :)

[mikecase (-- gone --), 2016/02/09 22:18:34]

Wow. Kind of amazed you noticed that. Fixed.

-          'includes': [ '../build/host_jar.gypi' ],
+          'includes': [ '../build/host_jar.gypi',
+                        '../build/android/test_runner.gypi' ],
         },
         {
           # GN: //base:base_javatests