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

Side by Side Diff: base/base.isolate

Issue 954003002: Revert of xp: copy dbghelp.dll to output dir and have base.isolate use it there (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 | « base/base.gyp ('k') | base/debug/debugger_unittest.cc » ('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 16 matching lines...) Expand all
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"', { 33 ['OS=="win"', {
34 # Required for base/stack_trace_win.cc to symbolize correctly. 34 # Required for base/stack_trace_win.cc to symbolize correctly.
35 'variables': { 35 'variables': {
36 'files': [ 36 'files': [
37 '<(PRODUCT_DIR)/dbghelp.dll', 37 '../build/win/dbghelp_xp/dbghelp.dll',
38 ], 38 ],
39 }, 39 },
40 }], 40 }],
41 ['OS=="win" and asan==1 and component=="shared_library"', { 41 ['OS=="win" and asan==1 and component=="shared_library"', {
42 'variables': { 42 'variables': {
43 'files': [ 43 'files': [
44 '../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',
45 ], 45 ],
46 }, 46 },
47 }], 47 }],
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 '<(PRODUCT_DIR)/msvcr120.dll', 101 '<(PRODUCT_DIR)/msvcr120.dll',
102 ], 102 ],
103 }, 103 },
104 }], 104 }],
105 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 105 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211
106 ['asan==0 or lsan==0 or msan==0 or tsan==0', { 106 ['asan==0 or lsan==0 or msan==0 or tsan==0', {
107 'variables': {}, 107 'variables': {},
108 }], 108 }],
109 ], 109 ],
110 } 110 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | base/debug/debugger_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698