| 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', { | 12 ['OS=="linux" and asan==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 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"'
, { | 19 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"'
, { |
| 20 'variables': { | 20 'variables': { |
| 21 'files': [ | 21 'files': [ |
| 22 # Copy the VS runtime DLLs into the isolate so that they | 22 # Copy the VS runtime DLLs into the isolate so that they |
| 23 # don't have to be preinstalled on the target machine. | 23 # don't have to be preinstalled on the target machine. |
| 24 '<(PRODUCT_DIR)/msvcp120d.dll', | 24 '<(PRODUCT_DIR)/msvcp120d.dll', |
| 25 '<(PRODUCT_DIR)/msvcr120d.dll', | 25 '<(PRODUCT_DIR)/msvcr120d.dll', |
| 26 '<(PRODUCT_DIR)/x64/msvcp120.dll', |
| 27 '<(PRODUCT_DIR)/x64/msvcr120.dll', |
| 26 ], | 28 ], |
| 27 }, | 29 }, |
| 28 }], | 30 }], |
| 29 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release
"', { | 31 ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release
"', { |
| 30 'variables': { | 32 'variables': { |
| 31 'files': [ | 33 'files': [ |
| 32 # Copy the VS runtime DLLs into the isolate so that they | 34 # Copy the VS runtime DLLs into the isolate so that they |
| 33 # don't have to be preinstalled on the target machine. | 35 # don't have to be preinstalled on the target machine. |
| 34 '<(PRODUCT_DIR)/msvcp120.dll', | 36 '<(PRODUCT_DIR)/msvcp120.dll', |
| 35 '<(PRODUCT_DIR)/msvcr120.dll', | 37 '<(PRODUCT_DIR)/msvcr120.dll', |
| 36 '<(PRODUCT_DIR)/x64/msvcp120.dll', | |
| 37 '<(PRODUCT_DIR)/x64/msvcr120.dll', | |
| 38 ], | 38 ], |
| 39 }, | 39 }, |
| 40 }], | 40 }], |
| 41 ], | 41 ], |
| 42 } | 42 } |
| OLD | NEW |