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

Unified Diff: android_webview/android_webview.gyp

Issue 541753002: android_webview: stop using system ICU. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 919733bd2fa2c5d8292e91f52d44faac93f33d6d..524b80b6f074880d1068d0f3ac791fd5a929871b 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -54,6 +54,16 @@
'-Wl,--fatal-warnings',
],
}],
+ ['android_webview_build==1 and use_system_stlport==1', {
+ # 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
+ # removed once we stop using the system stlport.
+ # http://crbug.com/409851
+ 'libraries': [
+ '-lgabi++',
+ ],
+ }],
],
'sources': [
'lib/main/webview_entry_point.cc',
« 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