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