| 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 ['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. |
| 37 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', | 37 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', |
| 38 ], | 38 ], |
| 39 }, | 39 }, |
| 40 }], | 40 }], |
| 41 ['asan==1', { | 41 ['asan==1', { |
| 42 'variables': { | 42 'variables': { |
| 43 'files': [ | 43 'files': [ |
| 44 '../tools/valgrind/asan/', | 44 '../tools/valgrind/asan/', |
| 45 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT
ABLE_SUFFIX)', | 45 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUT
ABLE_SUFFIX)', |
| 46 ], | 46 ], |
| 47 }, | 47 }, |
| 48 }], | 48 }], |
| 49 ['lsan==1', { | 49 ['lsan==1', { |
| 50 'variables': { | 50 'variables': { |
| 51 'files': [ | 51 'files': [ |
| 52 '../tools/lsan/suppressions.txt', | 52 '../tools/lsan/suppressions.txt', |
| 53 ], | 53 ], |
| 54 }, | 54 }, |
| 55 }], | 55 }], |
| 56 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"'
, { | 56 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug"
or CONFIGURATION_NAME=="Debug_x64")', { |
| 57 'variables': { | 57 'variables': { |
| 58 'files': [ | 58 'files': [ |
| 59 # Copy the VS runtime DLLs into the isolate so that they | 59 # Copy the VS runtime DLLs into the isolate so that they |
| 60 # don't have to be preinstalled on the target machine. | 60 # don't have to be preinstalled on the target machine. |
| 61 '<(PRODUCT_DIR)/msvcp120d.dll', | 61 '<(PRODUCT_DIR)/msvcp120d.dll', |
| 62 '<(PRODUCT_DIR)/msvcr120d.dll', | 62 '<(PRODUCT_DIR)/msvcr120d.dll', |
| 63 '<(PRODUCT_DIR)/x64/msvcp120d.dll', | 63 '<(PRODUCT_DIR)/x64/msvcp120d.dll', |
| 64 '<(PRODUCT_DIR)/x64/msvcr120d.dll', | 64 '<(PRODUCT_DIR)/x64/msvcr120d.dll', |
| 65 ], | 65 ], |
| 66 }, | 66 }, |
| 67 }], | 67 }], |
| 68 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release
"', { | 68 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Releas
e" or CONFIGURATION_NAME=="Release_x64")', { |
| 69 'variables': { | 69 'variables': { |
| 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 } |
| OLD | NEW |