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

Side by Side Diff: build/config/win/msvs_dependencies.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 | « build/android/pylib/utils/isolator.py ('k') | build/isolate.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file.
4 {
5 'conditions': [
6 # Copy the VS runtime DLLs into the isolate so that they
7 # don't have to be preinstalled on the target machine.
8 #
9 # VS2013 runtimes
10 ['OS=="win" and msvs_version==2013 and component=="shared_library" and CONFI GURATION_NAME=="Debug"', {
11 'variables': {
12 'files': [
13 '<(PRODUCT_DIR)/x64/msvcp120d.dll',
14 '<(PRODUCT_DIR)/x64/msvcr120d.dll',
15 ],
16 },
17 }],
18 ['OS=="win" and msvs_version==2013 and component=="shared_library" and CONFI GURATION_NAME=="Release"', {
19 'variables': {
20 'files': [
21 '<(PRODUCT_DIR)/x64/msvcp120.dll',
22 '<(PRODUCT_DIR)/x64/msvcr120.dll',
23 ],
24 },
25 }],
26 ['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONF IGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
27 'variables': {
28 'files': [
29 '<(PRODUCT_DIR)/msvcp120d.dll',
30 '<(PRODUCT_DIR)/msvcr120d.dll',
31 ],
32 },
33 }],
34 ['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONF IGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
35 'variables': {
36 'files': [
37 '<(PRODUCT_DIR)/msvcp120.dll',
38 '<(PRODUCT_DIR)/msvcr120.dll',
39 ],
40 },
41 }],
42 # VS2015 runtimes
43 ['OS=="win" and msvs_version==2015 and component=="shared_library" and CONFI GURATION_NAME=="Debug"', {
44 'variables': {
45 'files': [
46 '<(PRODUCT_DIR)/x64/msvcp140d.dll',
47 '<(PRODUCT_DIR)/x64/vccorlib140d.dll',
48 ],
49 },
50 }],
51 ['OS=="win" and msvs_version==2015 and component=="shared_library" and CONFI GURATION_NAME=="Release"', {
52 'variables': {
53 'files': [
54 '<(PRODUCT_DIR)/x64/msvcp140.dll',
55 '<(PRODUCT_DIR)/x64/vccorlib140.dll',
56 ],
57 },
58 }],
59 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
60 'variables': {
61 'files': [
62 '<(PRODUCT_DIR)/msvcp140d.dll',
63 '<(PRODUCT_DIR)/vccorlib140d.dll',
64 ],
65 },
66 }],
67 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
68 'variables': {
69 'files': [
70 '<(PRODUCT_DIR)/msvcp140.dll',
71 '<(PRODUCT_DIR)/vccorlib140.dll',
72 ],
73 },
74 }],
75 ],
76 }
OLDNEW
« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | build/isolate.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698