From 2f017213ed940754da2bbc24fadd5386fe82e3fc Mon Sep 17 00:00:00 2001 From: torne Date: Fri, 17 Oct 2014 05:42:28 -0700 Subject: [PATCH] Revert "android_webview: go back to using system ICU." This reverts commit 96256bfea5c496aa70b1913555b1e1c7f166c426, returning the webview build to using Chrome's copy of ICU. BUG=409851 NOTRY=true Review URL: https://codereview.chromium.org/661983002 Cr-Commit-Position: refs/heads/master@{#300092} --- android_webview/libwebviewchromium.gypi | 2 +- build/common.gypi | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi index 43e5df11afdc..0e605f0bc639 100644 --- a/android_webview/libwebviewchromium.gypi +++ b/android_webview/libwebviewchromium.gypi @@ -49,7 +49,7 @@ '-Wl,--fatal-warnings', ], }], - ['android_webview_build==1 and use_system_stlport==1 and use_system_icu==0', { + ['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 diff --git a/build/common.gypi b/build/common.gypi index d3f30e65195f..e9e8a3eec349 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1762,7 +1762,6 @@ # When building as part of the Android system, use system libraries # where possible to reduce ROM size. - 'use_system_icu%': '<(android_webview_build)', 'use_system_stlport%': '<(android_webview_build)', # Copy it out one scope. -- 2.11.4.GIT