Chromium Code Reviews| Index: url/BUILD.gn |
| diff --git a/url/BUILD.gn b/url/BUILD.gn |
| index 6445bfbb3d7dcbad895021085c7f3d14f11ccf69..67a9817bd2dc769ab6763bb08a5481a5737f0413 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", |
|
mef
2014/05/01 19:45:15
should this go into some android-specific section?
mmenke
2014/05/01 21:01:33
Files that have platform names in their paths aren
mef
2014/05/02 15:10:48
sgtm. I thought it only applied to name suffix, ni
|
| + "android/url_jni_registrar.h", |
| "gurl.cc", |
| "gurl.h", |
| "third_party/mozilla/url_parse.cc", |
| @@ -52,13 +54,32 @@ component("url") { |
| "//third_party/icu:icudata", |
| "//third_party/icu", |
| ] |
| -} |
| + if (use_icu_alternatives) { |
| + 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. |
| 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", |
| @@ -84,5 +105,21 @@ if (!is_android) { |
| "//testing/gtest", |
| "//third_party/icu:icuuc", |
| ] |
| + |
| + if (use_icu_alternatives) { |
| + sources -= [ |
| + "url_canon_icu_unittest.cc", |
| + ] |
| + deps -= [ |
| + "//base:i18n", |
| + "//third_party/icu:icuuc", |
| + ] |
| + |
| + if (is_android) { |
| + sources += [ |
| + "url_canon_icu_alternatives_android.cc", |
| + ] |
| + } |
| + } |
| } |
| } |