| Index: base/base.isolate
|
| diff --git a/base/base.isolate b/base/base.isolate
|
| index 948c60045ff24213210f8f7c4c87fbd9559131eb..e2d8beaca8a44a8149042f7a6e9d0ecb69d6cb12 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': {},
|
|
|