Move cronet from //net into //components.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 2f84d4e824388acff66e528362f46d16197759b4..81d5b39880078ee3854289dadf36f815a257bba7 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -3231,188 +3231,5 @@
         },
       ],
     }],
-    ['OS=="android"', {
-      # TODO(mef): Consider moving all Cronet Android targets into separate
-      # file. Also figure out what needs to be done for gn script.
-      'targets': [
-        {
-          'target_name': 'cronet_jni_headers',
-          'type': 'none',
-          'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequest.java',
-            'cronet/android/java/src/org/chromium/net/UrlRequestContext.java',
-          ],
-          'variables': {
-            'jni_gen_package': 'cronet',
-            'jni_generator_ptr_type': 'long',
-          },
-          'includes': [ '../build/jni_generator.gypi' ],
-        },
-        {
-          'target_name': 'cronet_url_request_error_list',
-          'type': 'none',
-          'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequestError.template',
-          ],
-          'variables': {
-            'package_name': 'org/chromium/cronet',
-            'template_deps': ['cronet/android/org_chromium_net_UrlRequest_error_list.h'],
-          },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
-        },
-        {
-          'target_name': 'cronet_url_request_priority_list',
-          'type': 'none',
-          'sources': [
-            'cronet/android/java/src/org/chromium/net/UrlRequestPriority.template',
-          ],
-          'variables': {
-            'package_name': 'org/chromium/cronet',
-            'template_deps': ['cronet/android/org_chromium_net_UrlRequest_priority_list.h'],
-          },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
-        },
-        {
-          'target_name': 'libcronet',
-          'type': 'shared_library',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-            '../url/url.gyp:url_lib',
-            'cronet_jni_headers',
-            'cronet_url_request_error_list',
-            'cronet_url_request_priority_list',
-            'net',
-          ],
-          'sources': [
-            'cronet/android/org_chromium_net_UrlRequest.cc',
-            'cronet/android/org_chromium_net_UrlRequest.h',
-            'cronet/android/org_chromium_net_UrlRequest_error_list.h',
-            'cronet/android/org_chromium_net_UrlRequest_priority_list.h',
-            'cronet/android/org_chromium_net_UrlRequestContext.cc',
-            'cronet/android/url_request_context_peer.cc',
-            'cronet/android/url_request_context_peer.h',
-            'cronet/android/url_request_peer.cc',
-            'cronet/android/url_request_peer.h',
-          ],
-          'cflags': [
-            # TODO(mef): Figure out a good way to get version from chrome_version_info_posix.h.
-            '-DCHROMIUM_VERSION=\\"TBD\\"',
-            '-DLOGGING=1',
-            '-fdata-sections',
-            '-ffunction-sections',
-            '-fno-rtti',
-            '-fvisibility=hidden',
-            '-fvisibility-inlines-hidden',
-            '-Wno-sign-promo',
-            '-Wno-missing-field-initializers',
-          ],
-          'ldflags': [
-            '-llog',
-            '-landroid',
-            '-Wl,--gc-sections',
-            '-Wl,--exclude-libs,ALL'
-          ]
-        },
-        {
-          'target_name': 'cronet',
-          'type': 'none',
-          'dependencies': [
-            '../base/base.gyp:base',
-            'libcronet',
-            'cronet_url_request_error_list',
-            'cronet_url_request_priority_list',
-          ],
-          'variables': {
-            'java_in_dir': 'cronet/android/java',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
-          'target_name': 'cronet_package',
-          'type': 'none',
-          'dependencies': [
-            'libcronet',
-            'cronet',
-          ],
-          'variables': {
-              'native_lib': 'libcronet.>(android_product_extension)',
-              'java_lib': 'cronet.jar',
-              'package_dir': '<(PRODUCT_DIR)/cronet',
-          },
-          'actions': [
-            {
-              'action_name': 'strip libcronet',
-              'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'],
-              'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)'],
-              'action': [
-                '<(android_strip)',
-                '--strip-unneeded',
-                '<@(_inputs)',
-                '-o',
-                '<@(_outputs)',
-              ],
-            },
-          ],
-          'copies': [
-            {
-              'destination': '<(package_dir)',
-              'files': [
-                '<(PRODUCT_DIR)/lib.java/<(java_lib)',
-              ],
-            },
-          ],
-        },
-        {
-          'target_name': 'cronet_sample_apk',
-          'type': 'none',
-          'dependencies': [
-            'cronet',
-          ],
-          'variables': {
-            'apk_name': 'CronetSample',
-            'java_in_dir': 'cronet/android/sample',
-            'resource_dir': 'cronet/android/sample/res',
-            'native_lib_target': 'libcronet',
-          },
-          'includes': [ '../build/java_apk.gypi' ],
-        },
-        {
-          # cronet_sample_apk creates a .jar as a side effect. Any java targets
-          # that need that .jar in their classpath should depend on this target,
-          # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its
-          # jar path in the variable 'apk_output_jar_path'. This target should
-          # only be used by targets which instrument cronet_sample_apk.
-          'target_name': 'cronet_sample_apk_java',
-          'type': 'none',
-          'dependencies': [
-            'cronet_sample_apk',
-          ],
-          'includes': [ '../build/apk_fake_jar.gypi' ],
-        },
-        {
-          'target_name': 'cronet_sample_test_apk',
-          'type': 'none',
-          'dependencies': [
-            'cronet_sample_apk_java',
-            '../base/base.gyp:base_java',
-            '../base/base.gyp:base_javatests',
-            '../base/base.gyp:base_java_test_support',
-            # TODO(mef): Figure out why some tests are failing.
-            #'../net/net.gyp:net_javatests',
-            #'../net/net.gyp:net_java_test_support',
-          ],
-          'variables': {
-            'apk_name': 'CronetSampleTest',
-            'java_in_dir': 'cronet/android/sample/javatests',
-            'resource_dir': 'cronet/android/sample/res',
-            'is_test_apk': 1,
-          },
-          'includes': [ '../build/java_apk.gypi' ],
-        },
-      ],
-    }],  # OS=="android"
   ],
 }