Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

net/net.gyp

 # Copyright 2013 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': {
     'chromium_code': 1,
     'linux_link_kerberos%': 0,
     'conditions': [
       ['chromeos==1 or embedded==1 or OS=="ios"', {
@@ skipping 620 matching lines @@
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['OS == "android"', {
           'dependencies': [
             'net_test_jni_headers',
           ],
           'sources': [
+            'test/android/net_test_jni_onload.cc',
+            'test/android/net_test_jni_onload.h',
             'test/embedded_test_server/android/embedded_test_server_android.cc',
             'test/embedded_test_server/android/embedded_test_server_android.h',
             'test/spawned_test_server/remote_test_server.cc',
             'test/spawned_test_server/remote_test_server.h',
             'test/spawned_test_server/spawner_communicator.cc',
             'test/spawned_test_server/spawner_communicator.h',
           ],
         }],
         [ 'use_v8_in_net==1', {
             'dependencies': [
@@ skipping 725 matching lines @@
           'variables': {
             'jni_gen_package': 'net',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'net_test_jni_headers',
           'type': 'none',
           'sources': [
             'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java',
-            'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java',
+            'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java',
             'test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java',
           ],
           'variables': {
             'jni_gen_package': 'net/test',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'net_java',
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
             '../base/base.gyp:base',
             'cert_verify_status_android_java',
             'certificate_mime_types_java',
             'network_change_notifier_types_java',
             'network_change_notifier_android_types_java',
             'net_errors_java',
             'private_key_types_java',
             'traffic_stats_error_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
-          'target_name': 'embedded_test_server_aidl',
-          'type': 'none',
-          'variables': {
-            'aidl_interface_file': '../net/test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerInterface.aidl',
-          },
-          'sources': [
-            '../net/test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerImpl.aidl',
-          ],
-          'includes': [ '../build/java_aidl.gypi' ],
-        },
-        {
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/test/android/javatests',
             # TODO(jbudorick): remove chromium_code: 0 line once crbug.com/488192 is fixed.
             'chromium_code': 0,
           },
           'dependencies': [
-            'embedded_test_server_aidl',
             'net_java',
+            'net_test_support',
             'url_request_failed_job_java',
             '../base/base.gyp:base_java',
-            '../base/base.gyp:base_java_test_support',
             '../third_party/android_tools/android_tools.gyp:legacy_http_javalib',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
-          'target_name': 'libnet_java_test_support',
-          'type': 'shared_library',
-          'dependencies': [
-            'net_test_support',
-            '../base/base.gyp:base',
-          ],
-          'sources': [
-            'test/android/net_test_entry_point.cc',
-            'test/android/net_test_jni_onload.cc',
-            'test/android/net_test_jni_onload.h',
-          ],
-        },
-        {
-          'target_name': 'net_test_support_apk',
-          'type': 'none',
-          'dependencies': [
-            'net_java_test_support',
-          ],
-          'variables': {
-            'android_manifest_path': 'test/android/javatests/AndroidManifest.xml',
-            'apk_name': 'ChromiumNetTestSupport',
-            'is_test_apk': 1,
-            'java_in_dir': 'test/android/javatests',
-            'java_in_dir_suffix': '/src_dummy',
-            'native_lib_target': 'libnet_java_test_support',
-          },
-          'includes': [
-            '../build/java_apk.gypi',
-          ],
-        },
-        {
-          # Targets that need the net test support APK should depend on this
-          # target. It ensures that the APK is built without passing the
-          # classpath on to dependent targets.
-          'target_name': 'require_net_test_support_apk',
-          'type': 'none',
-          'actions': [
-            {
-              'action_name': 'require_ChromiumNetTestSupport',
-              'variables': {
-                'required_file': '<(PRODUCT_DIR)/net_test_support_apk/ChromiumNetTestSupport.apk.required',
-              },
-              'inputs': [
-                '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk',
-              ],
-              'outputs': [
-                '<(required_file)',
-              ],
-              'action': [
-                'python', '../build/android/gyp/touch.py', '<(required_file)',
-              ],
-            },
-          ],
-        },
-        {
           'target_name': 'url_request_failed_job_java',
           'type': 'none',
           'variables': {
             'source_file': 'test/url_request/url_request_failed_job.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'net_javatests',
           'type': 'none',
@@ skipping 187 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }