Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Unified Diff: url/BUILD.gn

Issue 257673002: Make it possible to build url/ without ICU on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix GN/GYP Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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",
+ ]
+ }
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698