diff options
| author | sebmarchand <sebmarchand@chromium.org> | 2015-08-14 13:38:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-14 20:38:53 +0000 |
| commit | 568e81bce0dbf53936edfb4d54a5714749a2e619 (patch) | |
| tree | 1ab4515aef5ffdd533ee97ceefce78030955ab44 /base | |
| parent | b03fdc4d691ceba36245cd56379adff1d7231346 (diff) | |
| download | chromium_src-568e81bce0dbf53936edfb4d54a5714749a2e619.zip chromium_src-568e81bce0dbf53936edfb4d54a5714749a2e619.tar.gz chromium_src-568e81bce0dbf53936edfb4d54a5714749a2e619.tar.bz2 | |
Make VS2015 component builds work on swarming.
BUG=440500
Review URL: https://codereview.chromium.org/1252353005
Cr-Commit-Position: refs/heads/master@{#343482}
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.isolate | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/base/base.isolate b/base/base.isolate index 948c600..e2d8bea 100644 --- a/base/base.isolate +++ b/base/base.isolate @@ -9,6 +9,8 @@ '../third_party/icu/icu.isolate', # Sanitizer-instrumented third-party libraries (if enabled). '../third_party/instrumented_libraries/instrumented_libraries.isolate', + # MSVS runtime libraries. + '../build/config/win/msvs_dependencies.isolate', ], 'conditions': [ ['use_custom_libcxx==1', { @@ -58,40 +60,6 @@ ], }, }], - # Copy the VS runtime DLLs into the isolate so that they - # don't have to be preinstalled on the target machine. - ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/x64/msvcp120d.dll', - '<(PRODUCT_DIR)/x64/msvcr120d.dll', - ], - }, - }], - ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/x64/msvcp120.dll', - '<(PRODUCT_DIR)/x64/msvcr120.dll', - ], - }, - }], - ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/msvcp120d.dll', - '<(PRODUCT_DIR)/msvcr120d.dll', - ], - }, - }], - ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/msvcp120.dll', - '<(PRODUCT_DIR)/msvcr120.dll', - ], - }, - }], # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 ['asan==0 or lsan==0 or msan==0 or tsan==0', { 'variables': {}, |