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

Side by Side Diff: base/base.isolate

Issue 888783003: win/swarming: Make 64-bit component builds work on swarming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | no next file » | 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 ], 10 ],
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ], 46 ],
47 }, 47 },
48 }], 48 }],
49 ['lsan==1', { 49 ['lsan==1', {
50 'variables': { 50 'variables': {
51 'files': [ 51 'files': [
52 '../tools/lsan/suppressions.txt', 52 '../tools/lsan/suppressions.txt',
53 ], 53 ],
54 }, 54 },
55 }], 55 }],
56 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , { 56 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64)")', {
57 'variables': { 57 'variables': {
58 'files': [ 58 'files': [
59 # Copy the VS runtime DLLs into the isolate so that they 59 # Copy the VS runtime DLLs into the isolate so that they
60 # don't have to be preinstalled on the target machine. 60 # don't have to be preinstalled on the target machine.
61 '<(PRODUCT_DIR)/msvcp120d.dll', 61 '<(PRODUCT_DIR)/msvcp120d.dll',
62 '<(PRODUCT_DIR)/msvcr120d.dll', 62 '<(PRODUCT_DIR)/msvcr120d.dll',
63 '<(PRODUCT_DIR)/x64/msvcp120d.dll', 63 '<(PRODUCT_DIR)/x64/msvcp120d.dll',
64 '<(PRODUCT_DIR)/x64/msvcr120d.dll', 64 '<(PRODUCT_DIR)/x64/msvcr120d.dll',
65 ], 65 ],
66 }, 66 },
67 }], 67 }],
68 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', { 68 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Releas e" or CONFIGURATION_NAME=="Release_x64")', {
69 'variables': { 69 'variables': {
70 'files': [ 70 'files': [
71 # Copy the VS runtime DLLs into the isolate so that they 71 # Copy the VS runtime DLLs into the isolate so that they
72 # don't have to be preinstalled on the target machine. 72 # don't have to be preinstalled on the target machine.
73 '<(PRODUCT_DIR)/msvcp120.dll', 73 '<(PRODUCT_DIR)/msvcp120.dll',
74 '<(PRODUCT_DIR)/msvcr120.dll', 74 '<(PRODUCT_DIR)/msvcr120.dll',
75 ], 75 ],
76 }, 76 },
77 }], 77 }],
78 ], 78 ],
79 } 79 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698