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

Unified Diff: android_webview/libwebviewchromium.gypi

Issue 570383002: android_webview: go back to using system ICU. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual revert Created 6 years, 3 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 | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/libwebviewchromium.gypi
diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi
index 8bd11567b808be70771daf25cc7fa7e45734e7f0..d5c40ed885ecfa2dc1cca89919eb24d900ac523c 100644
--- a/android_webview/libwebviewchromium.gypi
+++ b/android_webview/libwebviewchromium.gypi
@@ -43,7 +43,7 @@
'-Wl,--fatal-warnings',
],
}],
- ['android_webview_build==1 and use_system_stlport==1', {
+ ['android_webview_build==1 and use_system_stlport==1 and use_system_icu==0', {
# ICU requires RTTI, which is not present in the system's stlport, so
# we have to include gabi++. We can't include it in icu.gyp because
# link_settings cannot be used inside target_conditions. This will be
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698