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

Side by Side Diff: base/base.isolate

Issue 373973002: Set CONFIGURATION_NAME to be used in base.isolate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/pylib/gtest/setup.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 ], 10 ],
11 'conditions': [ 11 'conditions': [
12 ['OS=="win" and component=="shared_library"', { 12 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , {
13 'variables': { 13 'variables': {
14 'isolate_dependency_tracked': [ 14 'isolate_dependency_tracked': [
15 # Copy the VS runtime DLLs into the isolate so that they 15 # Copy the VS runtime DLLs into the isolate so that they
16 # don't have to be preinstalled on the target machine. Note 16 # don't have to be preinstalled on the target machine.
17 # that depending on whether the build is Debug or Release,
18 # half of these dependencies will be broken, so these
19 # dependencies require --ignore-broken-items to be passed to
20 # the isolate driver.
21 '<(PRODUCT_DIR)/msvcp120d.dll', 17 '<(PRODUCT_DIR)/msvcp120d.dll',
18 '<(PRODUCT_DIR)/msvcr120d.dll',
19 ],
20 },
21 }],
22 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', {
23 'variables': {
24 'isolate_dependency_tracked': [
25 # Copy the VS runtime DLLs into the isolate so that they
26 # don't have to be preinstalled on the target machine.
22 '<(PRODUCT_DIR)/msvcp120.dll', 27 '<(PRODUCT_DIR)/msvcp120.dll',
23 '<(PRODUCT_DIR)/msvcr120d.dll',
24 '<(PRODUCT_DIR)/msvcr120.dll', 28 '<(PRODUCT_DIR)/msvcr120.dll',
25 ], 29 ],
26 }, 30 },
27 }], 31 }],
28 ], 32 ],
29 } 33 }
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/gtest/setup.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698