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

Unified Diff: net/BUILD.gn

Issue 933293003: [Cronet] Make Cronet buildable on regular Android bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments, now works on Cronet bot. Created 5 years, 9 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: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 8ebaaa03a197f1914321219fdc5462095892637e..3790a1d1df5dd09db8af3fa6362dbeed9edaa4b7 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -89,12 +89,10 @@ component("net") {
deps = [
":net_resources",
"//base",
- "//base:i18n",
"//base:prefs",
"//base/third_party/dynamic_annotations",
"//net/base/registry_controlled_domains",
"//sdch",
- "//third_party/icu",
"//third_party/zlib",
"//url",
]
@@ -512,19 +510,20 @@ component("net") {
}
if (use_icu_alternatives_on_android) {
- deps -= [
+ sources += [
+ "base/net_string_util_icu_alternatives_android.cc",
+ "base/net_string_util_icu_alternatives_android.h",
+ ]
+ } else {
+ deps += [
"//base:i18n",
"//third_party/icu",
]
- sources -= [
+ sources += [
"base/filename_util_icu.cc",
"base/net_string_util_icu.cc",
"base/net_util_icu.cc",
]
- sources += [
- "base/net_string_util_icu_alternatives_android.cc",
- "base/net_string_util_icu_alternatives_android.h",
- ]
}
}
« components/cronet.gypi ('K') | « components/cronet/cronet_static.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698