| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 # Copy the VS runtime DLLs into the isolate so that they |
| 57 # don't have to be preinstalled on the target machine. |
| 58 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"'
, { |
| 59 'variables': { |
| 60 'files': [ |
| 61 '<(PRODUCT_DIR)/x64/msvcp120d.dll', |
| 62 '<(PRODUCT_DIR)/x64/msvcr120d.dll', |
| 63 ], |
| 64 }, |
| 65 }], |
| 66 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release
"', { |
| 67 'variables': { |
| 68 'files': [ |
| 69 '<(PRODUCT_DIR)/x64/msvcp120.dll', |
| 70 '<(PRODUCT_DIR)/x64/msvcr120.dll', |
| 71 ], |
| 72 }, |
| 73 }], |
| 56 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug"
or CONFIGURATION_NAME=="Debug_x64")', { | 74 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug"
or CONFIGURATION_NAME=="Debug_x64")', { |
| 57 'variables': { | 75 'variables': { |
| 58 'files': [ | 76 'files': [ |
| 59 # Copy the VS runtime DLLs into the isolate so that they | |
| 60 # don't have to be preinstalled on the target machine. | |
| 61 '<(PRODUCT_DIR)/msvcp120d.dll', | 77 '<(PRODUCT_DIR)/msvcp120d.dll', |
| 62 '<(PRODUCT_DIR)/msvcr120d.dll', | 78 '<(PRODUCT_DIR)/msvcr120d.dll', |
| 63 '<(PRODUCT_DIR)/x64/msvcp120d.dll', | |
| 64 '<(PRODUCT_DIR)/x64/msvcr120d.dll', | |
| 65 ], | 79 ], |
| 66 }, | 80 }, |
| 67 }], | 81 }], |
| 68 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Releas
e" or CONFIGURATION_NAME=="Release_x64")', { | 82 ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Releas
e" or CONFIGURATION_NAME=="Release_x64")', { |
| 69 'variables': { | 83 'variables': { |
| 70 'files': [ | 84 'files': [ |
| 71 # Copy the VS runtime DLLs into the isolate so that they | |
| 72 # don't have to be preinstalled on the target machine. | |
| 73 '<(PRODUCT_DIR)/msvcp120.dll', | 85 '<(PRODUCT_DIR)/msvcp120.dll', |
| 74 '<(PRODUCT_DIR)/msvcr120.dll', | 86 '<(PRODUCT_DIR)/msvcr120.dll', |
| 75 ], | 87 ], |
| 76 }, | 88 }, |
| 77 }], | 89 }], |
| 78 ], | 90 ], |
| 79 } | 91 } |
| OLD | NEW |