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