[Cronet] Get Cronet performance test running again

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 1dd1a64c64396034135f12bf40a1f2265125f342..a324fcf60485e9efd4dde8fc6f42986c5706b87e 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -368,6 +368,8 @@
             'cronet/android/test/network_change_notifier_util.h',
             'cronet/android/test/cronet_url_request_context_config_test.cc',
             'cronet/android/test/cronet_url_request_context_config_test.h',
+            'cronet/android/test/cronet_test_util.cc',
+            'cronet/android/test/cronet_test_util.h',
           ],
           'dependencies': [
             'cronet_tests_jni_headers',
@@ -392,17 +394,38 @@
           'includes': [ 'cronet/cronet_static.gypi' ],
         },
         {
+          'target_name': 'cronet_test_support',
+          'type': 'none',
+          'dependencies': [
+            'cronet_java',
+            '../net/net.gyp:net_java_test_support',
+            '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative',
+            '../third_party/netty4/netty.gyp:netty_all',
+          ],
+          'variables': {
+            'java_in_dir': 'cronet/android/test',
+            'additional_src_dirs': [ 'cronet/android/test/javatests/src' ],
+            'run_findbugs': 1,
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
           'target_name': 'cronet_test_apk',
           'type': 'none',
           'dependencies': [
             'cronet_java',
+            'cronet_test_support',
             '../net/net.gyp:net_java_test_support',
             '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative',
             '../third_party/netty4/netty.gyp:netty_all',
           ],
           'variables': {
             'apk_name': 'CronetTest',
+            # There isn't an easy way to have a java_apk target without any Java
+            # so we'll borrow the trick from the net_test_support_apk target of
+            # pointing it at placeholder Java via java_in_dir_suffix.
             'java_in_dir': 'cronet/android/test',
+            'java_in_dir_suffix': '/src_dummy',
             'resource_dir': 'cronet/android/test/res',
             'asset_location': 'cronet/android/test/assets',
             'native_lib_target': 'libcronet_tests',
@@ -458,15 +481,16 @@
           'dependencies': [
             'cronet_java',
             'cronet_api',
+            'cronet_test_support',
           ],
           'variables': {
             'apk_name': 'CronetPerfTest',
             'java_in_dir': 'cronet/android/test/javaperftests',
-            'is_test_apk': 1,
-            'native_lib_target': 'libcronet',
+            'native_lib_target': 'libcronet_tests',
             'proguard_enabled': 'true',
             'proguard_flags_paths': [
               'cronet/android/proguard.cfg',
+              'cronet/android/test/javaperftests/proguard.cfg',
             ],
             'run_findbugs': 1,
           },