Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: base/base.isolate

Issue 1252353005: Make VS2015 component builds work on swarming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update the Androit isolator script. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/pylib/utils/isolator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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': {},
« no previous file with comments | « no previous file | build/android/pylib/utils/isolator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698