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

Side by Side Diff: base/base.isolate

Issue 623433005: Fix another silly mistake for debug c runtime dlls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 ],
11 'conditions': [ 11 'conditions': [
12 ['OS=="linux" and asan==1', { 12 ['OS=="linux" and asan==1', {
13 'variables': { 13 'variables': {
14 'files': [ 14 'files': [
15 '<(PRODUCT_DIR)/lib/libc++.so', 15 '<(PRODUCT_DIR)/lib/libc++.so',
16 ], 16 ],
17 }, 17 },
18 }], 18 }],
19 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , { 19 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , {
20 'variables': { 20 'variables': {
21 'files': [ 21 'files': [
22 # Copy the VS runtime DLLs into the isolate so that they 22 # Copy the VS runtime DLLs into the isolate so that they
23 # don't have to be preinstalled on the target machine. 23 # don't have to be preinstalled on the target machine.
24 '<(PRODUCT_DIR)/msvcp120d.dll', 24 '<(PRODUCT_DIR)/msvcp120d.dll',
25 '<(PRODUCT_DIR)/msvcr120d.dll', 25 '<(PRODUCT_DIR)/msvcr120d.dll',
26 '<(PRODUCT_DIR)/x64/msvcp120.dll', 26 '<(PRODUCT_DIR)/x64/msvcp120d.dll',
27 '<(PRODUCT_DIR)/x64/msvcr120.dll', 27 '<(PRODUCT_DIR)/x64/msvcr120d.dll',
28 ], 28 ],
29 }, 29 },
30 }], 30 }],
31 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', { 31 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', {
32 'variables': { 32 'variables': {
33 'files': [ 33 'files': [
34 # Copy the VS runtime DLLs into the isolate so that they 34 # Copy the VS runtime DLLs into the isolate so that they
35 # don't have to be preinstalled on the target machine. 35 # don't have to be preinstalled on the target machine.
36 '<(PRODUCT_DIR)/msvcp120.dll', 36 '<(PRODUCT_DIR)/msvcp120.dll',
37 '<(PRODUCT_DIR)/msvcr120.dll', 37 '<(PRODUCT_DIR)/msvcr120.dll',
scottmg 2014/10/02 02:53:25 probably should add x64/msvc[rp]120.dll here? or t
jam 2014/10/02 03:20:40 we don't use that anywhere. i'm hesitant to do stu
38 ], 38 ],
39 }, 39 },
40 }], 40 }],
41 ], 41 ],
42 } 42 }
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