Make it possible to build url/ without ICU on android.

url/url.gyp

Index: url/url.gyp
diff --git a/url/url.gyp b/url/url.gyp
index 93bbee2e17135802680bb9245edf6ec070983f0e..2f2008f5b5de5967e28d8bb912e9a3625014c483 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -33,6 +33,28 @@
       'defines': [
         'URL_IMPLEMENTATION',
       ],
+      'conditions': [
+        ['use_icu_alternatives == 1', {
+          'sources!': [
+            'url_canon_icu.cc',
+            'url_canon_icu.h',
+          ],
+          'dependencies!': [
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
+          ],
+        }],
+        ['OS == "android" and use_icu_alternatives == 1', {
+          'dependencies': [
+            'url_java',
+            'url_jni_headers',
+          ],
+          'sources': [
+            'url_canon_icu_alternatives_android.cc',
+            'url_canon_icu_alternatives_android.h',
+          ],
+        }],
+      ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
@@ -49,6 +71,7 @@
       'sources': [
         'gurl_unittest.cc',
         'origin_unittest.cc',
+        'url_canon_icu_unittest.cc',
         'url_canon_unittest.cc',
         'url_parse_unittest.cc',
         'url_test_utils.h',
@@ -63,9 +86,48 @@
             ],
           }
         ],
+        ['use_icu_alternatives == 1',
+          {
+            'sources!': [
+              'url_canon_icu_unittest.cc',
+            ],
+            'dependencies!': [
+              '../base/base.gyp:base_i18n',
+              '../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 == 1', {

[mef, 2014/05/01 19:45:15]

maybe add [and OS == "android"] ?

[mmenke, 2014/05/01 21:01:33]

Nice catch, done!  Think it's kinda weird things didn't break without that.

[mmenke, 2014/05/02 15:30:48]

You're right - realized that after I made the comment.

+      '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' ],
+        },
+      ],
+    }],
+  ],
 }