[Cronet] Make Cronet buildable on regular Android bots.

url/url.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,
   },
   'includes': [
     'url_srcs.gypi',
@@ skipping 82 matching lines @@
               '../third_party/icu/icu.gyp:icuuc',
             ],
           }
         ],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
   ],
   'conditions': [
-    ['use_icu_alternatives_on_android==1 and OS=="android"', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'url_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/url/IDNStringUtil.java'
           ],
           'variables': {
             'jni_gen_package': 'url',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'url_java',
           'type': 'none',
           'variables': {
             'java_in_dir': '../url/android/java',
           },
           'dependencies': [
             '../base/base.gyp:base',
           ],
           'includes': [ '../build/java.gypi' ],
         },
+        {
+          # Same as url_lib but using ICU alternatives on Android.

[brettw, 2015/02/24 18:30:54]

This doesn't make any sense because url_lib is defined above and has a condition
based on icu_alternatives. Did you mean to delete those conditions and make
url_lib always link ICU?

[mef, 2015/02/24 18:39:15]

Sorry, yes. Done. 

+          'target_name': 'url_lib_use_icu_alternatives_on_android',
+          'type': '<(component)',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            'url_java',
+            'url_jni_headers',
+          ],
+          'sources': [
+            '<@(gurl_sources)',
+            'url_canon_icu_alternatives_android.cc',
+            'url_canon_icu_alternatives_android.h',
+          ],
+          'sources!': [
+            'url_canon_icu.cc',
+            'url_canon_icu.h',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '..',
+            ],
+          },
+          'defines': [
+            'URL_IMPLEMENTATION',
+            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
+          ],
+        },
       ],
     }],
   ],
 }