Use Android-specific icudata file

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 71 matching lines @@
               'type': 'none',
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     'windows/icudt.dll',
                   ],
                 },
               ],
             }],
-            [ 'icu_use_data_file_flag', {
+            [ 'icu_use_data_file_flag==1', {
               # Remove any assembly data file.
               'sources/': [['exclude', 'icudt46l_dat']],
               # Compile in the stub data symbol.
               'sources': ['source/stubdata/stubdata.c'],
              
               # Make sure any binary depending on this gets the data file.
               'conditions': [
                 ['OS != "ios"', {
                   'copies': [{
                     'destination': '<(PRODUCT_DIR)',
-                    'files': [
-                      'source/data/in/icudtl.dat',
+                    'conditions': [
+                      ['OS == "android"', {
+                        'files': [
+                          'android/icudtl.dat',
+                        ],
+                      } , { # else: OS != android
+                        'files': [
+                          'source/data/in/icudtl.dat',
+                        ],
+                      }],
                     ],
                   }],
                 } , { # else: OS=="ios"
                   'link_settings': {
                     'mac_bundle_resources': [
                       'source/data/in/icudtl.dat',
                     ],
                   },
                 }], # OS!=ios
               ], # conditions
@@ skipping 446 matching lines @@
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
       ], # targets
     }],
   ], # conditions
 }