Remove net & url small, iOS ICU alternatives, unit tests.

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"', {
       'targets': [
         {
           'target_name': 'cronet_jni_headers',
@@ skipping 156 matching lines @@
                 'cronet/version.h.in',
                 '<@(_outputs)',
               ],
               'includes': [
                 '../build/util/version.gypi',
               ],
             },
           ],
         },
         {
-          # cronet_static_small target has reduced binary size through using
-          # ICU alternatives which requires file and ftp support be disabled.
-          'target_name': 'cronet_static_small',
+          'target_name': 'cronet_static',
           'type': 'static_library',
-          'defines': [
-            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
-            'DISABLE_FILE_SUPPORT=1',
-            'DISABLE_FTP_SUPPORT=1',
-          ],
           'dependencies': [
-            '../net/net.gyp:net_small',
-            '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+            '../net/net.gyp:net',
+            '../url/url.gyp:url_lib',
           ],
           'conditions': [
             ['enable_data_reduction_proxy_support==1',
               {
                 'dependencies': [
                   '../components/components.gyp:data_reduction_proxy_core_browser_small',
                 ],
               },
             ],
-          ],
-          'includes': [ 'cronet/cronet_static.gypi' ],
-        },
-        {
-          # cronet_static target depends on ICU and includes file and ftp support.
-          'target_name': 'cronet_static',
-          'type': 'static_library',
-          'dependencies': [
-            '../base/base.gyp:base_i18n',
-            '../net/net.gyp:net',
-            '../url/url.gyp:url_lib',
-          ],
-          'conditions': [
-            ['enable_data_reduction_proxy_support==1',
+            ['use_platform_icu_alternatives!=1',
               {
                 'dependencies': [
-                  '../components/components.gyp:data_reduction_proxy_core_browser',
+                  '../base/base.gyp:base_i18n',
                 ],
               },
             ],
           ],
           'includes': [ 'cronet/cronet_static.gypi' ],
         },
         {
           'target_name': 'libcronet',
           'type': 'shared_library',
           'sources': [
             'cronet/android/cronet_jni.cc',
           ],
           'dependencies': [
-            'cronet_static_small',
+            'cronet_static',
             '../base/base.gyp:base',
-            '../net/net.gyp:net_small',
+            '../net/net.gyp:net',
           ],
           'ldflags': [
             '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/components/cronet/android/only_jni_exports.lst',
           ],
           'variables': {
             # libcronet doesn't really use native JNI exports, but it does use
             # its own linker version script. The ARM64 linker appears to not
             # work with multiple version scripts with anonymous version tags,
             # so enable use_native_jni_exports which avoids adding another
             # version sript (android_no_jni_exports.lst) so we don't run afoul
@@ skipping 183 matching lines @@
             # work with multiple version scripts with anonymous version tags,
             # so enable use_native_jni_exports which avoids adding another
             # version sript (android_no_jni_exports.lst) so we don't run afoul
             # of this ARM64 linker limitation.
             'use_native_jni_exports': 1,
           },
           'conditions': [
             ['enable_data_reduction_proxy_support==1',
               {
                 'dependencies': [
-                  '../components/components.gyp:data_reduction_proxy_core_browser',
+                  '../components/components.gyp:data_reduction_proxy_core_browser_small',
                 ],
               },
             ],
           ],
           'includes': [ 'cronet/cronet_static.gypi' ],
         },
         {
           'target_name': 'cronet_test_support',
           'type': 'none',
           'dependencies': [
@@ skipping 274 matching lines @@
               ],
             },
             {
               'destination': '<(package_dir)/symbols/<(android_app_abi)',
               'files': [
                 '<(SHARED_LIB_DIR)/<(native_lib)',
               ],
             },
           ],
         },
+        {
+          # GN version: //components/cronet/android:features
+          'target_name': 'components_cronet_android_features',
+          'includes': [ '../build/buildflag_header.gypi' ],
+          'variables': {
+            'buildflag_header_path': 'components/cronet/android/features.h',
+            'buildflag_flags': [
+              'USE_PLATFORM_ICU_ALTERNATIVES=<(use_platform_icu_alternatives)',
+            ],
+          },
+        }
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,
       },
     }],  # OS=="android"
   ],
 }