Enable icu_use_data_file_flag on Android

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9cbe3724151315ac6fd337fb6f68786317f76c6e..354fb07721dbac34d95f4cd62d96246310147165 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -154,6 +154,7 @@
         'use_goma%': 0,
         'gomadir%': '',
 
+

[Mark Mentovai, 2014/02/20 14:15:54]

Extra blank line.

         'conditions': [
           # Ash needs Aura.
           ['use_aura==0', {
@@ -823,6 +824,15 @@
           'remoting%': 0,
           'enable_printing%': 0,
         }],
+
+	# By default, use ICU data file (icudtl.dat) on all platforms
+	# except when building Android WebView.
+	# TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
+        ['android_webview_build==0', {
+          'icu_use_data_file_flag%' : 1,
+        }, {
+          'icu_use_data_file_flag%' : 0,
+        }],
       ],
 
       # Set this to 1 to enable use of concatenated impulse responses
@@ -972,6 +982,7 @@
     'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
     'use_system_libjpeg%': '<(use_system_libjpeg)',
     'android_webview_build%': '<(android_webview_build)',
+    'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',
     'gyp_managed_install%': 0,
     'create_standalone_apk%': 1,
     'enable_app_list%': '<(enable_app_list)',
@@ -1267,9 +1278,6 @@
     # IPC fuzzer is disabled by default.
     'enable_ipc_fuzzer%': 0,
 
-    # Whether or not to use "icu*.dat" file for ICU data.
-    # Do not use it by default.
-    'icu_use_data_file_flag%': 0,
 
     # Force disable libstdc++ debug mode.
     'disable_glibcxx_debug%': 0,
@@ -1304,7 +1312,6 @@
       }],
       ['OS=="win"', {
         'windows_driver_kit_path%': '$(WDK_DIR)',
-        'icu_use_data_file_flag%': 1,
       }],
       ['os_posix==1 and OS!="mac" and OS!="ios"', {
         'conditions': [
@@ -1327,21 +1334,11 @@
             # can use breakpad for these builds.
             'release_unwind_tables%': 0,
           }],
-          # TODO(jungshik): Turn this on on Android.
-          # For ChromeOS, this should be turned on in chromeos-chrome.ebuild
-          # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
-          ['OS!="android"', {
-            'icu_use_data_file_flag%': 1,
-          }],
         ],
       }],  # os_posix==1 and OS!="mac" and OS!="ios"
-      ['OS=="mac"', {
-        'icu_use_data_file_flag%': 1,
-      }],  # os=="mac"
       ['OS=="ios"', {
         'disable_nacl%': 1,
         'enable_background%': 0,
-        'icu_use_data_file_flag%': 1,
         'use_system_libxml%': 1,
         'use_system_sqlite%': 1,
         'locales==': [