| 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). | 10 # Sanitizer-instrumented third-party libraries (if enabled). |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 # Required for base/stack_trace_win.cc to symbolize correctly. | 29 # Required for base/stack_trace_win.cc to symbolize correctly. |
| 30 'variables': { | 30 'variables': { |
| 31 'files': [ | 31 'files': [ |
| 32 '<(PRODUCT_DIR)/dbghelp.dll', | 32 '<(PRODUCT_DIR)/dbghelp.dll', |
| 33 ], | 33 ], |
| 34 }, | 34 }, |
| 35 }], | 35 }], |
| 36 ['OS=="win" and asan==1 and component=="shared_library"', { | 36 ['OS=="win" and asan==1 and component=="shared_library"', { |
| 37 'variables': { | 37 'variables': { |
| 38 'files': [ | 38 'files': [ |
| 39 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows
/clang_rt.asan_dynamic-i386.dll', | 39 # We only need x.y.z/lib/windows/clang_rt.asan_dynamic-i386.dll, |
| 40 # but since the version (x.y.z) changes, just grab the whole dir. |
| 41 '../third_party/llvm-build/Release+Asserts/lib/clang/', |
| 40 ], | 42 ], |
| 41 }, | 43 }, |
| 42 }], | 44 }], |
| 43 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { | 45 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { |
| 44 'variables': { | 46 'variables': { |
| 45 'files': [ | 47 'files': [ |
| 46 # For llvm-symbolizer. | 48 # For llvm-symbolizer. |
| 47 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', | 49 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', |
| 48 ], | 50 ], |
| 49 }, | 51 }, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 '<(PRODUCT_DIR)/msvcr120.dll', | 91 '<(PRODUCT_DIR)/msvcr120.dll', |
| 90 ], | 92 ], |
| 91 }, | 93 }, |
| 92 }], | 94 }], |
| 93 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 | 95 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 |
| 94 ['asan==0 or lsan==0 or msan==0 or tsan==0', { | 96 ['asan==0 or lsan==0 or msan==0 or tsan==0', { |
| 95 'variables': {}, | 97 'variables': {}, |
| 96 }], | 98 }], |
| 97 ], | 99 ], |
| 98 } | 100 } |
| OLD | NEW |