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', |