Update Android WebView to use new system ICU

icu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     'icu.gypi',
   ],
   'variables': {
     'use_system_icu%': 0,
@@ skipping 350 matching lines @@
     }],
     ['use_system_icu==1', {
       'targets': [
         {
           'target_name': 'system_icu',
           'type': 'none',
           'conditions': [
             ['OS=="android"', {
               'direct_dependent_settings': {
                 'include_dirs': [
-                  '<(android_src)/external/icu4c/common',
-                  '<(android_src)/external/icu4c/i18n',
+                  '<(android_src)/external/icu/source/icu4c/common',

[Andrew Hayden (chromium.org), 2014/07/22 16:05:42]

I think you inverted this, shouldn't it be icu/icu4c/source? And also the same
below?

[hjd, 2014/07/22 17:24:23]

Err... yes, I don't know quite how I managed that...

+                  '<(android_src)/external/icu/source/icu4c/i18n',
                 ],
               },
               'link_settings': {
                 'libraries': [
                   '-licui18n',
                   '-licuuc',
                 ],
               },
             }],
             ['OS=="qnx"', {
@@ skipping 212 matching lines @@
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
       ], # targets
     }],
   ], # conditions
 }