[Cronet] Make Cronet buildable on regular Android bots.

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index e7d68388bc844d5ce8bf99456e00c56593172c71..f39e1960b1a19a19970974763ede848e1a4847b5 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -99,78 +99,24 @@
           ],
         },
         {
-          'target_name': 'cronet_static',
+          'target_name': 'cronet_static_small',

[xunjieli, 2015/02/25 15:06:56]

How about adding a comment here? along the line that cronet_static_small has
ICU, FILE support stripped, and it is used in production. cronet_static is only
used in tests.

I am thinking maybe naming them "cronet_static" and "cronet_static_tests" might
be clearer as to when they are used.

[mef, 2015/02/26 21:22:51]

Done.
Well, integration of Cronet into Webview will use full cronet_static, so I'd
rather not call it 'cronet_static_tests'.

I'm contemplating renaming cronet_static_small into cronet_static_lean, but I
don't have strong preference.

           'type': 'static_library',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-            'cronet_jni_headers',
-            'cronet_url_request_context_config_list',
-            'cronet_url_request_java',
-            'cronet_version',
-            'metrics',
-            '../net/net.gyp:net',
+          'defines': [
+            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
+            'DISABLE_FILE_SUPPORT=1',
+            'DISABLE_FTP_SUPPORT=1',
           ],
-          'sources': [
-            'cronet/android/chromium_url_request.cc',
-            'cronet/android/chromium_url_request.h',
-            'cronet/android/chromium_url_request_context.cc',
-            'cronet/android/chromium_url_request_context.h',
-            'cronet/android/chromium_url_request_error_list.h',
-            'cronet/android/chromium_url_request_priority_list.h',
-            'cronet/android/cronet_histogram_manager.cc',
-            'cronet/android/cronet_histogram_manager.h',
-            'cronet/android/cronet_library_loader.cc',
-            'cronet/android/cronet_library_loader.h',
-            'cronet/android/cronet_upload_data_stream_adapter.cc',
-            'cronet/android/cronet_upload_data_stream_adapter.h',
-            'cronet/android/cronet_upload_data_stream_delegate.cc',
-            'cronet/android/cronet_upload_data_stream_delegate.h',
-            'cronet/android/cronet_url_request.cc',
-            'cronet/android/cronet_url_request.h',
-            'cronet/android/cronet_url_request_adapter.cc',
-            'cronet/android/cronet_url_request_adapter.h',
-            'cronet/android/cronet_url_request_context_adapter.cc',
-            'cronet/android/cronet_url_request_context_adapter.h',
-            'cronet/android/url_request_adapter.cc',
-            'cronet/android/url_request_adapter.h',
-            'cronet/android/url_request_context_adapter.cc',
-            'cronet/android/url_request_context_adapter.h',
-            'cronet/android/wrapped_channel_upload_element_reader.cc',
-            'cronet/android/wrapped_channel_upload_element_reader.h',
-            'cronet/url_request_context_config.cc',
-            'cronet/url_request_context_config.h',
-            'cronet/url_request_context_config_list.h',
-          ],
-          'cflags': [
-            '-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'
+          'dependencies': [
+            '../net/net.gyp:net_small',
           ],
-          'conditions': [
-            [ 'use_icu_alternatives_on_android == 1', {
-                'dependencies!': [
-                  '../base/base.gyp:base_i18n',
-                  '../third_party/icu/icu.gyp:icui18n',
-                  '../third_party/icu/icu.gyp:icuuc',
-                ]
-              },
-            ],
+          'dependencies!': [
+            '../net/net.gyp:net',
           ],
+          'includes': [ 'cronet/cronet_static.gypi' ],
+        },
+        {
+          'target_name': 'cronet_static',

[xunjieli, 2015/02/25 15:06:56]

Should "cronet_static" have DISABLE_FTP_SUPPORT=1 as well?

+          'includes': [ 'cronet/cronet_static.gypi' ],
         },
         {
           'target_name': 'libcronet',
@@ -179,10 +125,10 @@
             'cronet/android/cronet_jni.cc',
           ],
           'dependencies': [
-            'cronet_static',
+            'cronet_static_small',
             '../base/base.gyp:base',
-            '../net/net.gyp:net',
-            '../url/url.gyp:url_lib',
+            '../net/net.gyp:net_small',
+            '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
           ],
         },
         { # cronet_stub.jar defines HttpUrlRequest interface and provides its
@@ -401,10 +347,6 @@
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
-      ],
-    }],  # OS=="android"
-    ['OS=="android" and use_icu_alternatives_on_android==1', {
-      'targets': [
         {
           'target_name': 'cronet_package',
           'type': 'none',
@@ -533,6 +475,6 @@
           ],
         },
       ],
-    }],  # OS=="android" and use_icu_alternatives_on_android==1
+    }],  # OS=="android"
   ],
 }