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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/pylib/utils/isolator.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'includes': [ 5 'includes': [
6 # While the target 'base' doesn't depend on ../third_party/icu/icu.gyp 6 # While the target 'base' doesn't depend on ../third_party/icu/icu.gyp
7 # itself, virtually all targets using it has to include icu. The only 7 # itself, virtually all targets using it has to include icu. The only
8 # exception is the Windows sandbox (?). 8 # exception is the Windows sandbox (?).
9 '../third_party/icu/icu.isolate', 9 '../third_party/icu/icu.isolate',
10 # Sanitizer-instrumented third-party libraries (if enabled). 10 # Sanitizer-instrumented third-party libraries (if enabled).
11 '../third_party/instrumented_libraries/instrumented_libraries.isolate', 11 '../third_party/instrumented_libraries/instrumented_libraries.isolate',
12 # MSVS runtime libraries.
13 '../build/config/win/msvs_dependencies.isolate',
12 ], 14 ],
13 'conditions': [ 15 'conditions': [
14 ['use_custom_libcxx==1', { 16 ['use_custom_libcxx==1', {
15 'variables': { 17 'variables': {
16 'files': [ 18 'files': [
17 '<(PRODUCT_DIR)/lib/libc++.so', 19 '<(PRODUCT_DIR)/lib/libc++.so',
18 ], 20 ],
19 }, 21 },
20 }], 22 }],
21 ['OS=="mac" and asan==1', { 23 ['OS=="mac" and asan==1', {
(...skipping 29 matching lines...) Expand all
51 }, 53 },
52 }], 54 }],
53 ['asan==1 or lsan==1 or msan==1 or tsan==1', { 55 ['asan==1 or lsan==1 or msan==1 or tsan==1', {
54 'variables': { 56 'variables': {
55 'files': [ 57 'files': [
56 '../tools/valgrind/asan/', 58 '../tools/valgrind/asan/',
57 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT ABLE_SUFFIX)', 59 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT ABLE_SUFFIX)',
58 ], 60 ],
59 }, 61 },
60 }], 62 }],
61 # Copy the VS runtime DLLs into the isolate so that they
62 # don't have to be preinstalled on the target machine.
63 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , {
64 'variables': {
65 'files': [
66 '<(PRODUCT_DIR)/x64/msvcp120d.dll',
67 '<(PRODUCT_DIR)/x64/msvcr120d.dll',
68 ],
69 },
70 }],
71 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', {
72 'variables': {
73 'files': [
74 '<(PRODUCT_DIR)/x64/msvcp120.dll',
75 '<(PRODUCT_DIR)/x64/msvcr120.dll',
76 ],
77 },
78 }],
79 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
80 'variables': {
81 'files': [
82 '<(PRODUCT_DIR)/msvcp120d.dll',
83 '<(PRODUCT_DIR)/msvcr120d.dll',
84 ],
85 },
86 }],
87 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Releas e" or CONFIGURATION_NAME=="Release_x64")', {
88 'variables': {
89 'files': [
90 '<(PRODUCT_DIR)/msvcp120.dll',
91 '<(PRODUCT_DIR)/msvcr120.dll',
92 ],
93 },
94 }],
95 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 63 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211
96 ['asan==0 or lsan==0 or msan==0 or tsan==0', { 64 ['asan==0 or lsan==0 or msan==0 or tsan==0', {
97 'variables': {}, 65 'variables': {},
98 }], 66 }],
99 ], 67 ],
100 } 68 }
OLDNEW
« 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