Include icu.isolate instead of listing icudt.dll

build/isolate.gypi

Index: build/isolate.gypi
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 2c667de5712d069ab2ba2940ed946c1864dba55d..974ed6f468c67a20f24da9dc89aaed7462394443 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -70,6 +70,7 @@
         # like '0' or '1', aren't stripped out by GYP.
         '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
         '--config-variable', 'OS=<(OS)',
+        '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',

[jungshik at Google, 2014/01/07 18:55:53]

This does not seem to work : 

I got the following error when I ran 

$ ninja -C out/Release base_unittests_run -j 100

ninja: Entering directory `out/Release'
[1/1] RULE base_unittests_run: isolate_a9b5ed4f58cc2ce951f8c7e385152c2c
base_unittests.isolate
FAILED: D:\src\cr\t.git2\src\third_party\python_26\python.exe gyp-win-tool
action-wrapper environment.x86
base_unittests_run_target_isolate_a9b5ed4f58cc2ce951f8c7e385152c2c.7eb976ef1f47d67b191dfcf55446bf98.rsp
..\..\base
[------ Swarming Error ------]
Variables in merged .isolate files do not match: ('OS',) and ('OS',
'icu_use_data_file_flag')
Traceback (most recent call last):
  File "../tools/swarming_client/isolate.py", line 2189, in main
    return dispatcher.execute(OptionParserIsolate(version=__version__), argv)
  File
"D:\src\cr\t.git2\src\tools\swarming_client\third_party\depot_tools\subcommand.py",
line 242, in execute
    return command(parser, args[1:])
  File "../tools/swarming_client/isolate.py", line 1760, in CMDcheck
    options, os.getcwd(), options.subdir, False)
  File "../tools/swarming_client/isolate.py", line 1577, in load_complete_state
    options.extra_variables, options.ignore_broken_items)
  File "../tools/swarming_client/isolate.py", line 1380, in load_isolate
    self.saved_state.config_variables)
  File "../tools/swarming_client/isolate.py", line 1024, in
load_isolate_for_config
    isolate = load_isolate_as_config(isolate_dir, eval_content(content), None)
  File "../tools/swarming_client/isolate.py", line 1010, in
load_isolate_as_config
    isolate = union(isolate, included_isolate)
  File "../tools/swarming_client/isolate.py", line 513, in union
    return lhs.union(rhs)
  File "../tools/swarming_client/isolate.py", line 857, in union
    config_variables, rhs.config_variables))
ExecutionError: Variables in merged .isolate files do not match: ('OS',) and
('OS', 'icu_use_data_file_flag')
[----------------------------]

         '--result', '<@(_outputs)',
         '--isolate', '<(RULE_INPUT_PATH)',
       ],