Remove Android system ICU support.

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 229 matching lines @@
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'AdditionalOptions': [
                     # See http://bugs.icu-project.org/trac/ticket/11122
                     '-Wno-inline-new-delete',
                     '-Wno-implicit-exception-spec-mismatch',
                   ],
                 },
               },
             }],
-            ['OS == "android" and use_system_stlport == 1', {
-              'target_conditions': [
-                ['_toolset == "target"', {
-                  # ICU requires RTTI, which is not present in the system's
-                  # stlport, so we have to include gabi++.
-                  'include_dirs': [
-                    '<(android_src)/abi/cpp/include',
-                  ],
-                }],
-              ],
-            }],
           ], # conditions
         },
         {
           'target_name': 'icuuc',
           'type': '<(component)',
           'sources': [
             '<@(icuuc_sources)',
           ],
           'defines': [
             'U_COMMON_IMPLEMENTATION',
@@ skipping 76 matching lines @@
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'AdditionalOptions': [
                     # See http://bugs.icu-project.org/trac/ticket/11122
                     '-Wno-inline-new-delete',
                     '-Wno-implicit-exception-spec-mismatch',
                   ],
                 },
               },
             }],
-            ['OS == "android" and use_system_stlport == 1', {
-              'target_conditions': [
-                ['_toolset == "target"', {
-                  # ICU requires RTTI, which is not present in the system's
-                  # stlport, so we have to include gabi++.
-                  'include_dirs': [
-                    '<(android_src)/abi/cpp/include',
-                  ],
-                }],
-              ],
-            }],
           ], # conditions
         },
       ], # targets
     }],
     ['use_system_icu==1', {
       'targets': [
         {
           'target_name': 'system_icu',
           'type': 'none',
           'conditions': [
-            ['OS=="android"', {
-              'direct_dependent_settings': {
-                'include_dirs': [
-                  '<(android_src)/external/icu/icu4c/source/common',
-                  '<(android_src)/external/icu/icu4c/source/i18n',
-                ],
-              },
-              'link_settings': {
-                'libraries': [
-                  '-licui18n',
-                  '-licuuc',
-                ],
-              },
-            }],
             ['OS=="qnx"', {
               'link_settings': {
                 'libraries': [
                   '-licui18n',
                   '-licuuc',
                 ],
               },
             }],
-            ['OS!="android" and OS!="qnx"', {
+            ['OS!="qnx"', {
               'link_settings': {
                 'ldflags': [
                   '<!@(icu-config --ldflags)',
                 ],
                 'libraries': [
                   '<!@(icu-config --ldflags-libsonly)',
                 ],
               },
             }],
           ],
@@ skipping 202 matching lines @@
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
       ], # targets
     }],
   ], # conditions
 }