Revert of [Android] Add a Java version of net::test_server::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,
     # Defines an extra set of libs with an alternate copy of org.apache.http.
     # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
     'net_test_extra_libs': [],
@@ skipping 159 matching lines @@
             'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'OS == "android"', {
           'sources!': [
             # See bug http://crbug.com/344533.
             'disk_cache/blockfile/index_table_v3_unittest.cc',
           ],
           'dependencies': [
             'net_javatests',
+            'net_test_jni_headers',
           ],
         }],
         [ 'use_nss_certs != 1', {
           'sources!': [
             'cert/nss_cert_database_unittest.cc',
             'cert/nss_cert_database_chromeos_unittest.cc',
             'cert/nss_profile_filter_chromeos_unittest.cc',
             'ssl/client_cert_store_chromeos_unittest.cc',
             'ssl/client_cert_store_nss_unittest.cc',
           ],
@@ skipping 390 matching lines @@
         'test/net_test_suite.cc',
         'test/net_test_suite.h',
         'test/python_utils.cc',
         'test/python_utils.h',
         'test/spawned_test_server/base_test_server.cc',
         'test/spawned_test_server/base_test_server.h',
         'test/spawned_test_server/local_test_server.cc',
         'test/spawned_test_server/local_test_server.h',
         'test/spawned_test_server/local_test_server_posix.cc',
         'test/spawned_test_server/local_test_server_win.cc',
+        'test/spawned_test_server/remote_test_server.cc',
+        'test/spawned_test_server/remote_test_server.h',
         'test/spawned_test_server/spawned_test_server.h',
+        'test/spawned_test_server/spawner_communicator.cc',
+        'test/spawned_test_server/spawner_communicator.h',
         'test/url_request/url_request_failed_job.cc',
         'test/url_request/url_request_failed_job.h',
         'test/url_request/url_request_mock_data_job.cc',
         'test/url_request/url_request_mock_data_job.h',
         'test/url_request/url_request_slow_download_job.cc',
         'test/url_request/url_request_slow_download_job.h',
         'url_request/test_url_fetcher_factory.cc',
         'url_request/test_url_fetcher_factory.h',
         'url_request/url_request_test_util.cc',
         'url_request/url_request_test_util.h',
@@ skipping 21 matching lines @@
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../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',
+        ['OS != "android"', {
+          'sources!': [
             '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': [
               'net_with_v8',
             ],
@@ skipping 712 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/EmbeddedTestServer.java',
           ],
           'variables': {
-            'jni_gen_package': 'net/test',
+            'jni_gen_package': 'net',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'net_java',
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
@@ skipping 21 matching lines @@
           ],
           'includes': [ '../build/java_aidl.gypi' ],
         },
         {
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/test/android/javatests',
           },
           'dependencies': [
-            'net_test_support',
             'url_request_failed_job_java',
             '../base/base.gyp:base_java',
             '<@(net_test_extra_libs)',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'url_request_failed_job_java',
           'type': 'none',
           'variables': {
@@ skipping 130 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }