[Cronet] Get Cronet performance test running again

components/cronet.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['OS=="android"', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
@@ skipping 306 matching lines @@
           'type': 'none',
           'sources': [
             'cronet/android/test/src/org/chromium/net/CronetTestUtil.java',
             'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java',
             'cronet/android/test/src/org/chromium/net/MockCertVerifier.java',
             'cronet/android/test/src/org/chromium/net/NativeTestServer.java',
             'cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java',
             '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',
           },
           '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': [
             'cronet/android/test/cronet_test_jni.cc',
             'cronet/android/test/mock_cert_verifier.cc',
             'cronet/android/test/mock_cert_verifier.h',
             'cronet/android/test/mock_url_request_job_factory.cc',
             'cronet/android/test/mock_url_request_job_factory.h',
             'cronet/android/test/native_test_server.cc',
             'cronet/android/test/native_test_server.h',
             'cronet/android/test/quic_test_server.cc',
             'cronet/android/test/quic_test_server.h',
             'cronet/android/test/sdch_test_util.cc',
             'cronet/android/test/sdch_test_util.h',
             'cronet/android/test/test_upload_data_stream_handler.cc',
             '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',
             '../base/base.gyp:base',
             '../net/net.gyp:net',
             '../net/net.gyp:net_quic_proto',
             '../net/net.gyp:net_test_support',
             '../net/net.gyp:simple_quic_tools',
             '../base/base.gyp:base_i18n',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
           ],
           'conditions': [
             ['enable_data_reduction_proxy_support==1',
               {
                 'dependencies': [
                   '../components/components.gyp:data_reduction_proxy_core_browser',
                 ],
               },
             ],
           ],
           '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': {
             'apk_name': 'CronetTest',
             'java_in_dir': 'cronet/android/test',
             'resource_dir': 'cronet/android/test/res',
             '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' ],
         },
         {
           # cronet_test_apk creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
           # cronet_test_apk_java. Dependents of cronet_test_apk receive its
           # jar path in the variable 'apk_output_jar_path'. This target should
           # only be used by targets which instrument cronet_test_apk.
           'target_name': 'cronet_test_apk_java',
@@ skipping 16 matching lines @@
             'resource_dir': 'cronet/android/test/res',
             'is_test_apk': 1,
             'run_findbugs': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           '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',
             ],
             'run_findbugs': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cronet_unittests',
@@ skipping 178 matching lines @@
             },
           ],
         },
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,
       },
     }],  # OS=="android"
   ],
 }