Revert of [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.
 
 {
   'variables': {
     'enable_bidirectional_stream%': 0,
   },
   'conditions': [
     ['OS=="android"', {
@@ skipping 350 matching lines @@
             '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',
-            'cronet/android/test/cronet_test_util.cc',
-            'cronet/android/test/cronet_test_util.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': 'cronet_test_support',
+          'target_name': 'cronet_test_apk',
           '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',
             'run_findbugs': 1,
             'additional_bundled_libs': [
               '>(netty_tcnative_so_file_location)',
             ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
@@ skipping 35 matching lines @@
             },],
           ],
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cronet_perf_test_apk',
           'type': 'none',
           'dependencies': [
             'cronet_java',
             'cronet_api',
-            'cronet_test_support',
           ],
           'variables': {
             'apk_name': 'CronetPerfTest',
             'java_in_dir': 'cronet/android/test/javaperftests',
-            'native_lib_target': 'libcronet_tests',
+            'is_test_apk': 1,
+            'native_lib_target': 'libcronet',
             'proguard_enabled': 'true',
             'proguard_flags_paths': [
               'cronet/android/proguard.cfg',
-              'cronet/android/test/javaperftests/proguard.cfg',
             ],
             'run_findbugs': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cronet_unittests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             'cronet_static',
@@ skipping 175 matching lines @@
             },
           ],
         },
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,
       },
     }],  # OS=="android"
   ],
 }