Add support for icu_use_data_file=1 to icu.gyp on Windows

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.
 
 {
   'variables': {
     'use_system_icu%': 0,
     'icu_use_data_file_flag%': 0,
     'want_separate_host_toolset%': 1,
   },
@@ skipping 53 matching lines @@
              'android/icudt46l_dat.S',
              'linux/icudt46l_dat.S',
              'mac/icudt46l_dat.S',
           ],
           'conditions': [
             [ 'use_system_icu==1', {
               'toolsets': ['host'],
             }, {
               'toolsets': ['host', 'target'],
             }],
-            [ 'OS == "win"', {
+            [ 'OS == "win" and icu_use_data_file_flag==0', {
               'type': 'none',
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     'windows/icudt.dll',
                   ],
                 },
               ],
             }],
-            [ 'OS != "win" and icu_use_data_file_flag', {
+            [ 'icu_use_data_file_flag', {
               # 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.
               'link_settings': {
                 'target_conditions': [
                   ['(OS == "mac" and _mac_bundle) or OS=="ios"', {
                     'mac_bundle_resources': [
                       'source/data/in/icudt46l.dat',
                     ],
                   }, {
                     'copies': [{

[scottmg, 2013/12/16 19:23:31]

I don't understand why this 'copies' is inside of 'link_settings'?

                       'destination': '<(PRODUCT_DIR)',
                       'files': [
                         'source/data/in/icudt46l.dat',
                       ],
                     }],
                   }],
                 ],  # target_conditions
               },  # link_settings
             }],
           ],
@@ skipping 758 matching lines @@
               'toolsets': ['target'],
             }, {
               'toolsets': ['host', 'target'],
             }],
           ],
         },
       ],
     }],
   ],
 }