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',
+              'conditions': [
+                ['OS=="ios"', {
+                  'mac_bundle_resources': [

[Mark Mentovai, 2013/12/18 21:58:28]

This is a static_library, but a static_library can’t be a mac_bundle, so this is
meaningless. The file won’t be copied anywhere.

[jungshik at Google, 2013/12/18 22:06:13]

Hmm.. Then, I wonder how iOS could have worked so far? iOS has had
icu_use_data_file_flag set to 1 for a long while (before I did anything).  In
this CL, I removed link_settings and replaced 'target_conditions' with
'conditions'. 

+                    'source/data/in/icudtl.dat',
+                  ],
+                }, {

[jungshik at Google, 2013/12/18 21:33:36]

Trybot failed for a CL at https://codereview.chromium.org/118313004/ that rolls
icu to this version. It's ios_debug_simulator. base_unittests or net_unittests
failed to find icudtl.dat.  See
http://build.chromium.org/p/tryserver.chromium/builders/ios_dbg_simulator/bui...

I wonder which of two changes, removing link_settings and replacing
target_conditions with conditions is to blame for the failure. 

 

+                  'copies': [{
+                    'destination': '<(PRODUCT_DIR)',
+                    'files': [
+                      'source/data/in/icudtl.dat',
                     ],
-                  }, {
-                    'copies': [{
-                      'destination': '<(PRODUCT_DIR)',
-                      'files': [
-                        'source/data/in/icudt46l.dat',
-                      ],
-                    }],
                   }],
-                ],  # target_conditions
-              },  # link_settings
+                }],
+              ],  # target_conditions
             }],
           ],
           'target_conditions': [
             [ 'OS == "win" or OS == "mac" or OS == "ios" or '
               '(OS == "android" and (_toolset == "target" or host_os != "linux"))', {
               'sources!': ['linux/icudt46l_dat.S'],
             }],
             [ 'OS != "android" or _toolset == "host"', {
               'sources!': ['android/icudt46l_dat.S'],
             }],
@@ skipping 750 matching lines @@
               'toolsets': ['target'],
             }, {
               'toolsets': ['host', 'target'],
             }],
           ],
         },
       ],
     }],
   ],
 }