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

Side by Side Diff: base/base.isolate

Issue 960873002: Update from https://crrev.com/318214 (Closed) Base URL: https://github.com/domokit/mojo.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 | « base/base.gypi ('k') | base/base_unittests.isolate » ('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 ],
(...skipping 12 matching lines...) Expand all
23 ], 23 ],
24 }, 24 },
25 }], 25 }],
26 ['OS=="mac" and asan==1', { 26 ['OS=="mac" and asan==1', {
27 'variables': { 27 'variables': {
28 'files': [ 28 'files': [
29 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', 29 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib',
30 ], 30 ],
31 }, 31 },
32 }], 32 }],
33 ['OS=="win"', {
34 # Required for base/stack_trace_win.cc to symbolize correctly.
35 'variables': {
36 'files': [
37 '<(PRODUCT_DIR)/dbghelp.dll',
38 ],
39 },
40 }],
33 ['OS=="win" and asan==1 and component=="shared_library"', { 41 ['OS=="win" and asan==1 and component=="shared_library"', {
34 'variables': { 42 'variables': {
35 'files': [ 43 'files': [
36 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows /clang_rt.asan_dynamic-i386.dll', 44 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows /clang_rt.asan_dynamic-i386.dll',
37 ], 45 ],
38 }, 46 },
39 }], 47 }],
40 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { 48 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', {
41 'variables': { 49 'variables': {
42 'files': [ 50 'files': [
43 # For llvm-symbolizer. 51 # For llvm-symbolizer.
44 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', 52 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6',
45 ], 53 ],
46 }, 54 },
47 }], 55 }],
48 ['asan==1 or lsan==1 or msan==1 or tsan==1', { 56 ['asan==1 or lsan==1 or msan==1 or tsan==1', {
49 'variables': { 57 'variables': {
50 'files': [ 58 'files': [
51 '../tools/valgrind/asan/', 59 '../tools/valgrind/asan/',
52 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT ABLE_SUFFIX)', 60 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT ABLE_SUFFIX)',
53 ], 61 ],
54 }, 62 },
55 }], 63 }],
56 ['lsan==1', {
57 'variables': {
58 'files': [
59 '../tools/lsan/suppressions.txt',
60 ],
61 },
62 }],
63 # Copy the VS runtime DLLs into the isolate so that they 64 # Copy the VS runtime DLLs into the isolate so that they
64 # don't have to be preinstalled on the target machine. 65 # don't have to be preinstalled on the target machine.
65 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , { 66 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"' , {
66 'variables': { 67 'variables': {
67 'files': [ 68 'files': [
68 '<(PRODUCT_DIR)/x64/msvcp120d.dll', 69 '<(PRODUCT_DIR)/x64/msvcp120d.dll',
69 '<(PRODUCT_DIR)/x64/msvcr120d.dll', 70 '<(PRODUCT_DIR)/x64/msvcr120d.dll',
70 ], 71 ],
71 }, 72 },
72 }], 73 }],
(...skipping 20 matching lines...) Expand all
93 '<(PRODUCT_DIR)/msvcr120.dll', 94 '<(PRODUCT_DIR)/msvcr120.dll',
94 ], 95 ],
95 }, 96 },
96 }], 97 }],
97 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 98 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211
98 ['asan==0 or lsan==0 or msan==0 or tsan==0', { 99 ['asan==0 or lsan==0 or msan==0 or tsan==0', {
99 'variables': {}, 100 'variables': {},
100 }], 101 }],
101 ], 102 ],
102 } 103 }
OLDNEW
« no previous file with comments | « base/base.gypi ('k') | base/base_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698