[Cronet] Make Cronet buildable on regular Android bots.

url/url.gyp

Index: url/url.gyp
diff --git a/url/url.gyp b/url/url.gyp
index 0ffc51a8c410ecad04934baa5f790deae3c8d9d5..33b174000127e397c1bcf87b1a0767109a697012 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -100,7 +100,7 @@
     },
   ],
   'conditions': [
-    ['use_icu_alternatives_on_android==1 and OS=="android"', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'url_jni_headers',
@@ -124,6 +124,35 @@
           ],
           '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',
+          ],
+        },
       ],
     }],
   ],