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

Side by Side Diff: base/base.isolate

Issue 882943002: win/asan: Only package asan_dynamic dll in component builds. (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 | « 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 and chromeos==0', { 12 ['OS=="linux" and asan==1 and chromeos==0', {
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=="mac" and asan==1', { 19 ['OS=="mac" and asan==1', {
20 'variables': { 20 'variables': {
21 'files': [ 21 'files': [
22 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', 22 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib',
23 ], 23 ],
24 }, 24 },
25 }], 25 }],
26 ['OS=="win" and asan==1', { 26 ['OS=="win" and asan==1 and component=="shared_library"', {
27 'variables': { 27 'variables': {
28 'files': [ 28 'files': [
29 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows /clang_rt.asan_dynamic-i386.dll', 29 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows /clang_rt.asan_dynamic-i386.dll',
30 ], 30 ],
31 }, 31 },
32 }], 32 }],
33 ['OS=="linux" and asan==1', { 33 ['OS=="linux" and asan==1', {
34 'variables': { 34 'variables': {
35 'files': [ 35 'files': [
36 # For llvm-symbolizer. 36 # For llvm-symbolizer.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 'files': [ 70 'files': [
71 # Copy the VS runtime DLLs into the isolate so that they 71 # Copy the VS runtime DLLs into the isolate so that they
72 # don't have to be preinstalled on the target machine. 72 # don't have to be preinstalled on the target machine.
73 '<(PRODUCT_DIR)/msvcp120.dll', 73 '<(PRODUCT_DIR)/msvcp120.dll',
74 '<(PRODUCT_DIR)/msvcr120.dll', 74 '<(PRODUCT_DIR)/msvcr120.dll',
75 ], 75 ],
76 }, 76 },
77 }], 77 }],
78 ], 78 ],
79 } 79 }
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