Enable ICU in Android

base/base.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
     'base.gypi',
   ],
   'targets': [
     {
       'target_name': 'base_i18n',
       'type': '<(component)',
       'dependencies': [
         'base',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'conditions': [
         ['toolkit_uses_gtk==1', {
           'dependencies': [
             # i18n/rtl.cc uses gtk
             '../build/linux/system.gyp:gtk',
           ],
         }],
-        # TODO(michaelbai): This should be removed once icu supported 
-        ['OS == "android"', {
-          'dependencies!': [
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-          ],
-          'sources!': [
-            'i18n/base_i18n_export.h',
-            'i18n/bidi_line_iterator.cc',
-            'i18n/bidi_line_iterator.h',
-            'i18n/break_iterator.cc',
-            'i18n/break_iterator.h',
-            'i18n/char_iterator.cc',
-            'i18n/char_iterator.h',
-            'i18n/case_conversion.cc',
-            'i18n/case_conversion.h',
-            'i18n/file_util_icu.cc',
-            'i18n/file_util_icu.h',
-            'i18n/icu_encoding_detection.cc',
-            'i18n/icu_encoding_detection.h',
-            'i18n/icu_string_conversions.cc',
-            'i18n/icu_string_conversions.h',
-            'i18n/icu_util.cc',
-            'i18n/icu_util.h',
-            'i18n/number_formatting.cc',
-            'i18n/number_formatting.h',
-            'i18n/rtl.cc',
-            'i18n/rtl.h',
-            'i18n/string_search.cc',
-            'i18n/string_search.h',
-            'i18n/time_formatting.cc',
-            'i18n/time_formatting.h',
-          ],
-        }],
       ],
       'export_dependent_settings': [
         'base',
       ],
       'defines': [
         'BASE_I18N_IMPLEMENTATION',
       ],
       'sources': [
         'i18n/base_i18n_export.h',
         'i18n/bidi_line_iterator.cc',
@@ skipping 213 matching lines @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'includes': ['../build/nocompile.gypi'],
       'variables': {
          # TODO(ajwong): Is there a way to autodetect this?
         'module_dir': 'base'
       },
       'conditions': [
         ['OS == "android"', {
-          # TODO(michaelbai): This should be removed once icu supported
-          'dependencies!': [
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-          ],
           'sources!': [
-            # TODO(michaelbai): The belows are excluded because of the missing
-            # icu and should be added back once icu is ready.
-            'i18n/break_iterator_unittest.cc',
-            'i18n/char_iterator_unittest.cc',
-            'i18n/case_conversion_unittest.cc',
-            'i18n/file_util_icu_unittest.cc',
-            'i18n/icu_string_conversions_unittest.cc',
-            'i18n/number_formatting_unittest.cc',
-            'i18n/rtl_unittest.cc',
-            'i18n/string_search_unittest.cc',
-            'i18n/time_formatting_unittest.cc',
             # TODO(michaelbai): Removed the below once the fix upstreamed.
             'memory/mru_cache_unittest.cc',
             'process_util_unittest.cc',
             'synchronization/cancellation_flag_unittest.cc',
             # TODO(michaelbai): The below files are excluded because of the
             # missing JNI and should be added back once JNI is ready.
             'android/scoped_java_ref_unittest.cc',
             'debug/stack_trace_unittest.cc',
           ],
         }],
@@ skipping 166 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
       ],
     }],
   ],
 }