android_webview: go back to using system ICU.

android_webview: go back to using system ICU.

Partial revert of android_webview: stop using system ICU. (patchset #1 id:1 of https://codereview.chromium.org/541753002/)

Reason for revert:
We can't accept this size increase at present; revert until we've worked out what to do about it.

Original issue's description:
> android_webview: stop using system ICU.
>
> To support unbundled updates we need to stop depending on system
> libraries. Disable using the system version of ICU and instead link
> Chromium's copy.
>
> This increases binary size by ~7MB.
>
> BUG=409851
>
> Committed: https://crrev.com/48e43572c0bfef2b1434d7f330da86cc7770b592
> Cr-Commit-Position: refs/heads/master@{#293510}

BUG=409851
Committed: https://crrev.com/96256bfea5c496aa70b1913555b1e1c7f166c426
Cr-Commit-Position: refs/heads/master@{#295083}

[Torne, 2014-09-16 15:20:47]

Created Revert of android_webview: stop using system ICU.

[commit-bot: I haz the power, 2014-09-16 15:22:10]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/570383002/1

[benm (inactive), 2014-09-16 15:22:30]

lgtm

[commit-bot: I haz the power, 2014-09-16 15:22:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-16 15:22:35]

Failed to apply patch for android_webview/android_webview.gyp:
While running git apply --index -p1;
  error: patch failed: android_webview/android_webview.gyp:52
  error: android_webview/android_webview.gyp: patch does not apply

Patch:       android_webview/android_webview.gyp
Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp
b/android_webview/android_webview.gyp
index
524b80b6f074880d1068d0f3ac791fd5a929871b..919733bd2fa2c5d8292e91f52d44faac93f33d6d
100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -52,16 +52,6 @@
           ],
           'ldflags!': [
             '-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++',
           ],
         }],
       ],

[Torne, 2014-09-16 15:35:23]

OK, redid the revert locally and applied slightly different logic. Rather than
remove the section for using system stlport with non-system ICU I've just
corrected the condition to test use_system_icu as well, so we can now switch
back and forth by just changing the variable.

[benm (inactive), 2014-09-16 15:37:01]

lgtm

[Torne, 2014-09-16 15:37:42]

The CQ bit was checked by torne@chromium.org

[commit-bot: I haz the power, 2014-09-16 15:38:41]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/570383002/70001

[commit-bot: I haz the power, 2014-09-16 16:49:15]

Committed patchset #2 (id:70001) as 086725804eac7b42a455825662e6546c6bcb67cd

[commit-bot: I haz the power, 2014-09-16 16:50:39]

Patchset 2 (id:??) landed as
https://crrev.com/96256bfea5c496aa70b1913555b1e1c7f166c426
Cr-Commit-Position: refs/heads/master@{#295083}