diff options
| -rw-r--r-- | base/base_unittests.isolate | 4 | ||||
| -rw-r--r-- | build/android/pylib/gtest/setup.py | 3 | ||||
| -rw-r--r-- | build/isolate.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome.isolate | 4 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 4 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 4 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 4 | ||||
| -rw-r--r-- | net/net_unittests.isolate | 4 |
8 files changed, 24 insertions, 6 deletions
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index 59c7671..3f8f504 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -51,9 +51,11 @@ ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/icudt.dll', ], }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index 0896973c..6ea06fc 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -108,6 +108,8 @@ def _GenerateDepsDirUsingIsolate(suite_name): isolated_abs_path = os.path.join( constants.GetOutDirectory(), '%s.isolated' % suite_name) assert os.path.exists(isolate_abs_path) + # This needs to be kept in sync with the cmd line options for isolate.py + # in src/build/isolate.gypi. isolate_cmd = [ 'python', _ISOLATE_SCRIPT, 'remap', @@ -115,6 +117,7 @@ def _GenerateDepsDirUsingIsolate(suite_name): '--isolated', isolated_abs_path, '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(), '--config-variable', 'OS', 'android', + '--config-variable', 'icu_use_data_file_flag', '0', '--outdir', constants.ISOLATE_DEPS_DIR, ] assert not cmd_helper.RunCmd(isolate_cmd) diff --git a/build/isolate.gypi b/build/isolate.gypi index 0f2a301..cecf9b2 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -68,12 +68,15 @@ '<(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)', ], diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 2c4d44b..cc09a26 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -69,7 +69,6 @@ '<(PRODUCT_DIR)/clearkeycdmadapter.dll', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/icudt.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)', @@ -79,4 +78,7 @@ }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 5136ba3..248367e 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -78,7 +78,6 @@ '../net/data/ssl/certificates/mit.davidben.der', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/icudt.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', @@ -89,4 +88,7 @@ }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index a546e73..526b2e3 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -103,7 +103,6 @@ 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/icudt.dll', ], 'isolate_dependency_untracked': [ '../ppapi/lib/gl/include/KHR/', @@ -113,4 +112,7 @@ }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index 3a2e6f3..76ad361 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -69,10 +69,12 @@ ], 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', - '<(PRODUCT_DIR)/icudt.dll', '<(PRODUCT_DIR)/ui_test.pak', ], }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 2e04ea3..96e6517 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -41,9 +41,11 @@ ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/icudt.dll', ], }, }], ], + 'includes': [ + '../third_party/icu/icu.isolate', + ], } |