| 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). |
| 11 '../third_party/instrumented_libraries/instrumented_libraries.isolate', | 11 '../third_party/instrumented_libraries/instrumented_libraries.isolate', |
| 12 # MSVS runtime libraries. | 12 # MSVS runtime libraries. |
| 13 '../build/config/win/msvs_dependencies.isolate', | 13 '../build/config/win/msvs_dependencies.isolate', |
| 14 ], | 14 ], |
| 15 'conditions': [ | 15 'conditions': [ |
| 16 ['use_custom_libcxx==1', { | 16 ['use_custom_libcxx==1', { |
| 17 'variables': { | 17 'variables': { |
| 18 'files': [ | 18 'files': [ |
| 19 '<(PRODUCT_DIR)/lib/libc++.so', | 19 '<(PRODUCT_DIR)/lib/libc++.so', |
| 20 ], | 20 ], |
| 21 }, | 21 }, |
| 22 }], | 22 }], |
| 23 ['OS=="mac" and asan==1', { | 23 ['OS=="mac" and asan==1', { |
| 24 'variables': { | 24 'variables': { |
| 25 'files': [ | 25 'files': [ |
| 26 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', | 26 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', |
| 27 ], | 27 ], |
| 28 }, | 28 }, |
| 29 }], | 29 }], |
| 30 ['OS=="win"', { | |
| 31 # Required for base/stack_trace_win.cc to symbolize correctly. | |
| 32 'variables': { | |
| 33 'files': [ | |
| 34 '<(PRODUCT_DIR)/dbghelp.dll', | |
| 35 ], | |
| 36 }, | |
| 37 }], | |
| 38 ['OS=="win" and asan==1 and component=="shared_library"', { | 30 ['OS=="win" and asan==1 and component=="shared_library"', { |
| 39 'variables': { | 31 'variables': { |
| 40 'files': [ | 32 'files': [ |
| 41 # We only need x.y.z/lib/windows/clang_rt.asan_dynamic-i386.dll, | 33 # We only need x.y.z/lib/windows/clang_rt.asan_dynamic-i386.dll, |
| 42 # but since the version (x.y.z) changes, just grab the whole dir. | 34 # but since the version (x.y.z) changes, just grab the whole dir. |
| 43 '../third_party/llvm-build/Release+Asserts/lib/clang/', | 35 '../third_party/llvm-build/Release+Asserts/lib/clang/', |
| 44 ], | 36 ], |
| 45 }, | 37 }, |
| 46 }], | 38 }], |
| 47 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { | 39 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 59 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT
ABLE_SUFFIX)', | 51 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT
ABLE_SUFFIX)', |
| 60 ], | 52 ], |
| 61 }, | 53 }, |
| 62 }], | 54 }], |
| 63 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 | 55 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 |
| 64 ['asan==0 or lsan==0 or msan==0 or tsan==0', { | 56 ['asan==0 or lsan==0 or msan==0 or tsan==0', { |
| 65 'variables': {}, | 57 'variables': {}, |
| 66 }], | 58 }], |
| 67 ], | 59 ], |
| 68 } | 60 } |
| OLD | NEW |