[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 b9972a8e41bd78ec3cc246c45047dc7bdc8610b2..1ef6064d5b277ea706511fc49d9031e94e59ce52 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -324,7 +324,6 @@
             'cronet/android/test/src/org/chromium/net/QuicTestServer.java',
             'cronet/android/test/src/org/chromium/net/SdchObserver.java',
             'cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java',
-            'cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java',

[mef, 2015/12/29 17:27:44]

I'm not sure I completely understand the need for this split.

[pauljensen, 2016/01/21 03:51:50]

I reworked it so as to avoid the split by simply making a separate Java test
target.

           ],
           'variables': {
             'jni_gen_package': 'cronet_tests',
@@ -332,6 +331,17 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          'target_name': 'cronet_javatests_jni_headers',
+          'type': 'none',
+          'sources': [
+            'cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'cronet_javatests',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
           'target_name': 'libcronet_tests',
           'type': 'shared_library',
           'sources': [
@@ -350,8 +360,6 @@
             'cronet/android/test/test_upload_data_stream_handler.h',
             'cronet/android/test/network_change_notifier_util.cc',
             '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',
           ],
           'dependencies': [
             'cronet_tests_jni_headers',
@@ -376,10 +384,28 @@
           'includes': [ 'cronet/cronet_static.gypi' ],
         },
         {
+          'target_name': 'libcronet_javatests',
+          'type': 'shared_library',
+          'dependencies': [
+            'cronet_javatests_jni_headers',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'cronet/android/test/javatests/cronet_javatest_jni.cc',
+            'cronet/android/test/javatests/cronet_url_request_context_config_test.cc',
+            'cronet/android/test/javatests/cronet_url_request_context_config_test.h',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+        },
+        {
           'target_name': 'cronet_test_apk',
           'type': 'none',
           'dependencies': [
             'cronet_java',
+            'libcronet_tests',
+            'libcronet_javatests',
             '../net/net.gyp:net_java_test_support',
           ],
           'variables': {
@@ -389,6 +415,9 @@
             'asset_location': 'cronet/android/test/assets',
             'native_lib_target': 'libcronet_tests',
             'run_findbugs': 1,
+            'additional_bundled_libs': [
+              '<(SHARED_LIB_DIR)/libcronet_javatests.so',
+            ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
@@ -425,14 +454,14 @@
           'target_name': 'cronet_perf_test_apk',
           'type': 'none',
           'dependencies': [
-            'cronet_java',
+            'libcronet_tests',
+            'cronet_test_apk_java',
             'cronet_api',
           ],
           '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',