OLD | NEW |
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 # Sanitizer-instrumented third-party libraries (if enabled). |
| 11 '../third_party/instrumented_libraries/instrumented_libraries.isolate', |
10 ], | 12 ], |
11 'conditions': [ | 13 'conditions': [ |
12 ['use_custom_libcxx==1', { | 14 ['use_custom_libcxx==1', { |
13 'variables': { | 15 'variables': { |
14 'files': [ | 16 'files': [ |
15 '<(PRODUCT_DIR)/lib/libc++.so', | 17 '<(PRODUCT_DIR)/lib/libc++.so', |
16 ], | 18 ], |
17 }, | 19 }, |
18 }], | 20 }], |
19 ['use_instrumented_libraries==1', { | |
20 'variables': { | |
21 'files': [ | |
22 '<(PRODUCT_DIR)/instrumented_libraries/', | |
23 ], | |
24 }, | |
25 }], | |
26 ['OS=="mac" and asan==1', { | 21 ['OS=="mac" and asan==1', { |
27 'variables': { | 22 'variables': { |
28 'files': [ | 23 'files': [ |
29 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', | 24 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', |
30 ], | 25 ], |
31 }, | 26 }, |
32 }], | 27 }], |
33 ['OS=="win"', { | 28 ['OS=="win"', { |
34 # Required for base/stack_trace_win.cc to symbolize correctly. | 29 # Required for base/stack_trace_win.cc to symbolize correctly. |
35 'variables': { | 30 'variables': { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 '<(PRODUCT_DIR)/msvcr120.dll', | 89 '<(PRODUCT_DIR)/msvcr120.dll', |
95 ], | 90 ], |
96 }, | 91 }, |
97 }], | 92 }], |
98 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 | 93 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 |
99 ['asan==0 or lsan==0 or msan==0 or tsan==0', { | 94 ['asan==0 or lsan==0 or msan==0 or tsan==0', { |
100 'variables': {}, | 95 'variables': {}, |
101 }], | 96 }], |
102 ], | 97 ], |
103 } | 98 } |
OLD | NEW |