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

Side by Side Diff: base/base.isolate

Issue 596113002: Make isolated tests work with asan (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android Created 6 years, 3 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/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=="linux" and asan==1', {
13 'variables': {
14 'isolate_dependency_tracked': [
15 '<(PRODUCT_DIR)/lib/libc++.so',
16 ],
17 },
18 }],
12 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , { 19 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , {
13 'variables': { 20 'variables': {
14 'isolate_dependency_tracked': [ 21 'isolate_dependency_tracked': [
15 # Copy the VS runtime DLLs into the isolate so that they 22 # Copy the VS runtime DLLs into the isolate so that they
16 # don't have to be preinstalled on the target machine. 23 # don't have to be preinstalled on the target machine.
17 '<(PRODUCT_DIR)/msvcp120d.dll', 24 '<(PRODUCT_DIR)/msvcp120d.dll',
18 '<(PRODUCT_DIR)/msvcr120d.dll', 25 '<(PRODUCT_DIR)/msvcr120d.dll',
19 ], 26 ],
20 }, 27 },
21 }], 28 }],
22 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', { 29 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release "', {
23 'variables': { 30 'variables': {
24 'isolate_dependency_tracked': [ 31 'isolate_dependency_tracked': [
25 # Copy the VS runtime DLLs into the isolate so that they 32 # Copy the VS runtime DLLs into the isolate so that they
26 # don't have to be preinstalled on the target machine. 33 # don't have to be preinstalled on the target machine.
27 '<(PRODUCT_DIR)/msvcp120.dll', 34 '<(PRODUCT_DIR)/msvcp120.dll',
28 '<(PRODUCT_DIR)/msvcr120.dll', 35 '<(PRODUCT_DIR)/msvcr120.dll',
29 ], 36 ],
30 }, 37 },
31 }], 38 }],
32 ], 39 ],
33 } 40 }
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