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

url/BUILD.gn

Index: url/BUILD.gn
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 6445bfbb3d7dcbad895021085c7f3d14f11ccf69..17a6cb1da1c0e5c376343dd4e6ff502c681d7bae 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -8,6 +8,8 @@ component("url") {
     output_name = "url_lib"
   }
   sources = [
+    "android/url_jni_registrar.cc",
+    "android/url_jni_registrar.h",
     "gurl.cc",
     "gurl.h",
     "third_party/mozilla/url_parse.cc",
@@ -52,6 +54,24 @@ component("url") {
     "//third_party/icu:icudata",
     "//third_party/icu",
   ]
+
+  if (use_icu_alternatives) {

[brettw, 2014/05/02 23:51:02]

This will break the GN build since this value is never defined. We should answer
the question I wrote in the GYP file and then I it will tell us what to do here.

[mmenke, 2014/05/03 01:15:50]

I hadn't realized gn wasn't yet being used or tested on any platform.

+    sources -= [
+      "url_canon_icu.cc",
+      "url_canon_icu.h",
+    ]
+    deps -= [
+      "//third_party/icu:icudata",
+      "//third_party/icu",
+    ]
+
+    if (is_android) {
+      sources += [
+        "url_canon_icu_alternatives_android.cc",
+        "url_canon_icu_alternatives_android.h",
+      ]
+    }
+  }
 }
 
 # TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
@@ -59,6 +79,7 @@ if (!is_android) {
   test("url_unittests") {
     sources = [
       "gurl_unittest.cc",
+      "url_canon_icu_unittest.cc",
       "url_canon_unittest.cc",
       "url_parse_unittest.cc",
       "url_test_utils.h",
@@ -79,10 +100,18 @@ if (!is_android) {
 
     deps = [
       ":url",
-      "//base:i18n",
       "//base/test:run_all_unittests",
       "//testing/gtest",
       "//third_party/icu:icuuc",
     ]
+
+    if (use_icu_alternatives) {
+      sources -= [
+        "url_canon_icu_unittest.cc",
+      ]
+      deps -= [
+        "//third_party/icu:icuuc",
+      ]
+    }
   }
 }