[Cronet] Make Cronet buildable on regular Android bots.

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"', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
@@ skipping 81 matching lines @@
                 '-f', '<(version_path)',
                 '-f', '<(lastchange_path)',
                 '<(template_input_path)',
                 '<(output_path)',
               ],
               'message': 'Generating version information',
             },
           ],
         },
         {
-          'target_name': 'cronet_static',
-          'type': 'static_library',
+          # cronet_static_small target has reduced binary size through disabling
+          # of file and ftp support and using ICU alternatives.
+          'target_name': 'cronet_static_small',
+          'defines': [
+            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',

[mmenke, 2015/03/02 17:50:04]

Seems more than a little unfortunate that we're not testing anything with the
ICU alternatives.

[mef, 2015/03/03 17:37:48]

Yeah, I'm thinking that maybe Cronet bots should stay and test with ICU
alternative?

+            'DISABLE_FILE_SUPPORT=1',
+            'DISABLE_FTP_SUPPORT=1',
+          ],
           '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_small',
+          ],
+          'dependencies!': [
             '../net/net.gyp:net',
           ],
-          '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',
+          'includes': [ 'cronet/cronet_static.gypi' ],
+        },
+        {
+          # cronet_static_small target has reduced binary size through disabling
+          # of file and ftp support and using ICU alternatives.

[mmenke, 2015/03/02 17:50:04]

This comment is a little confusing, since cronet_static *also* disables file and
FTP support.

[mef, 2015/03/03 17:37:48]

Oops, copy-paste gone awry. Done.

+          'target_name': 'cronet_static',
+          'defines': [
+            'DISABLE_FILE_SUPPORT=1',
+            'DISABLE_FTP_SUPPORT=1',

[mmenke, 2015/03/02 17:50:04]

Wait...aren't we including a version of net/ build without these flags?

[mef, 2015/03/03 17:37:48]

Done.

           ],
-          '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'
-          ],
-          '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',
-                ]
-              },
-            ],
-          ],
+          'includes': [ 'cronet/cronet_static.gypi' ],

[mmenke, 2015/03/02 17:50:04]

I think we're missing a dependencies section.

[mef, 2015/03/03 17:37:48]

It is in cronet_static.gypi

         },
         {
           'target_name': 'libcronet',
           'type': 'shared_library',
           'sources': [
             '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
           # its implementation using HttpUrlConnection (not the Chromium stack).
           'target_name': 'cronet_stub',
           'type': 'none',
           'dependencies': [
             'cronet_url_request_context_config_list',
             'cronet_version',
           ],
@@ skipping 198 matching lines @@
             '../base/base.gyp:base_java_test_support',
           ],
           'variables': {
             'apk_name': 'CronetTestInstrumentation',
             'java_in_dir': 'cronet/android/test/javatests',
             'resource_dir': 'cronet/android/test/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
-      ],
-    }],  # OS=="android"
-    ['OS=="android" and use_icu_alternatives_on_android==1', {
-      'targets': [
         {
           'target_name': 'cronet_package',
           'type': 'none',
           'dependencies': [
             'libcronet',
             'cronet',
             'cronet_stub',
           ],
           'variables': {
             'native_lib': 'libcronet.>(android_product_extension)',
@@ skipping 108 matching lines @@
             },
             {
               'destination': '<(package_dir)/symbols/<(android_app_abi)',
               'files': [
                 '<(SHARED_LIB_DIR)/<(native_lib)',
               ],
             },
           ],
         },
       ],
-    }],  # OS=="android" and use_icu_alternatives_on_android==1
+    }],  # OS=="android"
   ],
 }