Chromium Code Reviews| 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 ], | 10 ], |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 ['OS=="linux" and asan==1 and chromeos==0', { | 12 ['use_custom_libcxx==1', { |
| 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 ['use_instrumented_libraries==1', { | |
| 20 'variables': { | |
| 21 'files': [ | |
| 22 '<(PRODUCT_DIR)/instrumented_libraries/', | |
| 23 ], | |
| 24 }, | |
| 25 }], | |
| 19 ['OS=="mac" and asan==1', { | 26 ['OS=="mac" and asan==1', { |
| 20 'variables': { | 27 'variables': { |
| 21 'files': [ | 28 'files': [ |
| 22 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', | 29 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', |
| 23 ], | 30 ], |
| 24 }, | 31 }, |
| 25 }], | 32 }], |
| 26 ['OS=="win" and asan==1 and component=="shared_library"', { | 33 ['OS=="win" and asan==1 and component=="shared_library"', { |
| 27 'variables': { | 34 'variables': { |
| 28 'files': [ | 35 'files': [ |
| 29 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows /clang_rt.asan_dynamic-i386.dll', | 36 '../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows /clang_rt.asan_dynamic-i386.dll', |
| 30 ], | 37 ], |
| 31 }, | 38 }, |
| 32 }], | 39 }], |
| 33 ['OS=="linux" and asan==1', { | 40 ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { |
|
M-A Ruel
2015/02/03 18:54:13
:)
| |
| 34 'variables': { | 41 'variables': { |
| 35 'files': [ | 42 'files': [ |
| 36 # For llvm-symbolizer. | 43 # For llvm-symbolizer. |
| 37 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', | 44 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', |
| 38 ], | 45 ], |
| 39 }, | 46 }, |
| 40 }], | 47 }], |
| 41 ['asan==1', { | 48 ['asan==1 or lsan==1 or msan==1 or tsan==1', { |
| 42 'variables': { | 49 'variables': { |
| 43 'files': [ | 50 'files': [ |
| 44 '../tools/valgrind/asan/', | 51 '../tools/valgrind/asan/', |
| 45 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT ABLE_SUFFIX)', | 52 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT ABLE_SUFFIX)', |
| 46 ], | 53 ], |
| 47 }, | 54 }, |
| 48 }], | 55 }], |
| 49 ['lsan==1', { | 56 ['lsan==1', { |
| 50 'variables': { | 57 'variables': { |
| 51 'files': [ | 58 'files': [ |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 70 'files': [ | 77 'files': [ |
| 71 # Copy the VS runtime DLLs into the isolate so that they | 78 # Copy the VS runtime DLLs into the isolate so that they |
| 72 # don't have to be preinstalled on the target machine. | 79 # don't have to be preinstalled on the target machine. |
| 73 '<(PRODUCT_DIR)/msvcp120.dll', | 80 '<(PRODUCT_DIR)/msvcp120.dll', |
| 74 '<(PRODUCT_DIR)/msvcr120.dll', | 81 '<(PRODUCT_DIR)/msvcr120.dll', |
| 75 ], | 82 ], |
| 76 }, | 83 }, |
| 77 }], | 84 }], |
| 78 ], | 85 ], |
| 79 } | 86 } |
| OLD | NEW |