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

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: Missed a spot Created 6 years, 7 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
« no previous file with comments | « net/test/run_all_unittests.cc ('k') | url/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/BUILD.gn
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 6445bfbb3d7dcbad895021085c7f3d14f11ccf69..faf8dd871f2bd90bd9963ee11de6e5635036258a 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -2,12 +2,26 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+declare_args() {
+ # Switches to using platform functions instead of ICU on Android.
+ use_icu_alternatives_on_android = false
+}
+
+# Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag.
+config("url_icu_config") {
+ if (use_icu_alternatives_on_android) {
+ defines = [ "USE_ICU_ALTERNATIVES_ON_ANDROID=1" ]
+ }
+}
+
component("url") {
if (is_win) {
# Don't conflict with Windows' "url.dll".
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",
@@ -42,6 +56,8 @@ component("url") {
defines = [ "URL_IMPLEMENTATION" ]
+ configs += [ ":url_icu_config" ]
+
# if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
# 'msvs_disabled_warnings': [ 4267, ]
@@ -52,6 +68,22 @@ component("url") {
"//third_party/icu:icudata",
"//third_party/icu",
]
+
+ if (use_icu_alternatives_on_android) {
+ sources -= [
+ "url_canon_icu.cc",
+ "url_canon_icu.h",
+ ]
+ deps -= [
+ "//third_party/icu:icudata",
+ "//third_party/icu",
+ ]
+
+ 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 +91,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 +112,18 @@ if (!is_android) {
deps = [
":url",
- "//base:i18n",
"//base/test:run_all_unittests",
"//testing/gtest",
"//third_party/icu:icuuc",
]
+
+ if (use_icu_alternatives_on_android) {
+ sources -= [
+ "url_canon_icu_unittest.cc",
+ ]
+ deps -= [
+ "//third_party/icu:icuuc",
+ ]
+ }
}
}
« no previous file with comments | « net/test/run_all_unittests.cc ('k') | url/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698