Include icu.isolate instead of listing icudt.dll

build/isolate.gypi

 # 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.
 
 # This file is meant to be included into a target to provide a rule
 # to "build" .isolate files into a .isolated file.
 #
 # To use this, create a gyp target with the following form:
 # 'conditions': [
 #   ['test_isolation_mode != "noop"', {
@@ skipping 50 matching lines @@
       ],
       'outputs': [
         '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
       ],
       'action': [
         'python',
         '<(DEPTH)/tools/swarming_client/isolate.py',
         '<(test_isolation_mode)',
         # Variables should use the -V FOO=<(FOO) form so frequent values,
         # like '0' or '1', aren't stripped out by GYP.
+        # This list needs to be kept in sync with the cmd line options
+        # in src/build/android/pylib/gtest/setup.py.
         '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
         '--config-variable', 'OS=<(OS)',
         # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
         # once support for user-defined config variables is added.
         '--config-variable',
         'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
+        '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
         '--result', '<@(_outputs)',
         '--isolate', '<(RULE_INPUT_PATH)',
       ],
       'conditions': [
         # Note: When gyp merges lists, it appends them to the old value.
         ['OS=="mac"', {
           # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
           # form.
           'action': [
             '--extra-variable', 'mac_product_name', '<(mac_product_name)',
@@ skipping 13 matching lines @@
         ['test_isolation_fail_on_missing == 0', {
             'action': ['--ignore_broken_items'],
           },
         ],
       ],
 
       'msvs_cygwin_shell': 0,
     },
   ],
 }