| 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 ], |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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 ['asan==1', { | 26 ['asan==1', { |
| 27 'variables': { | 27 'variables': { |
| 28 'files': [ | 28 'files': [ |
| 29 '../tools/valgrind/asan/', | 29 '../tools/valgrind/asan/', |
| 30 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer', | 30 '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer', |
| 31 '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6', |
| 31 ], | 32 ], |
| 32 }, | 33 }, |
| 33 }], | 34 }], |
| 35 ['lsan==1', { |
| 36 'variables': { |
| 37 'files': [ |
| 38 '../tools/lsan/suppressions.txt', |
| 39 ], |
| 40 }, |
| 41 }], |
| 34 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"'
, { | 42 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"'
, { |
| 35 'variables': { | 43 'variables': { |
| 36 'files': [ | 44 'files': [ |
| 37 # Copy the VS runtime DLLs into the isolate so that they | 45 # Copy the VS runtime DLLs into the isolate so that they |
| 38 # don't have to be preinstalled on the target machine. | 46 # don't have to be preinstalled on the target machine. |
| 39 '<(PRODUCT_DIR)/msvcp120d.dll', | 47 '<(PRODUCT_DIR)/msvcp120d.dll', |
| 40 '<(PRODUCT_DIR)/msvcr120d.dll', | 48 '<(PRODUCT_DIR)/msvcr120d.dll', |
| 41 '<(PRODUCT_DIR)/x64/msvcp120d.dll', | 49 '<(PRODUCT_DIR)/x64/msvcp120d.dll', |
| 42 '<(PRODUCT_DIR)/x64/msvcr120d.dll', | 50 '<(PRODUCT_DIR)/x64/msvcr120d.dll', |
| 43 ], | 51 ], |
| 44 }, | 52 }, |
| 45 }], | 53 }], |
| 46 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release
"', { | 54 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release
"', { |
| 47 'variables': { | 55 'variables': { |
| 48 'files': [ | 56 'files': [ |
| 49 # Copy the VS runtime DLLs into the isolate so that they | 57 # Copy the VS runtime DLLs into the isolate so that they |
| 50 # don't have to be preinstalled on the target machine. | 58 # don't have to be preinstalled on the target machine. |
| 51 '<(PRODUCT_DIR)/msvcp120.dll', | 59 '<(PRODUCT_DIR)/msvcp120.dll', |
| 52 '<(PRODUCT_DIR)/msvcr120.dll', | 60 '<(PRODUCT_DIR)/msvcr120.dll', |
| 53 ], | 61 ], |
| 54 }, | 62 }, |
| 55 }], | 63 }], |
| 56 ], | 64 ], |
| 57 } | 65 } |
| OLD | NEW |