Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 'conditions': [ | 5 'conditions': [ |
| 6 # Copy the VS runtime DLLs into the isolate so that they | 6 # Copy the VS runtime DLLs into the isolate so that they |
| 7 # don't have to be preinstalled on the target machine. | 7 # don't have to be preinstalled on the target machine. |
| 8 # | 8 # |
| 9 # VS2013 runtimes | 9 # VS2013 runtimes |
| 10 ['OS=="win" and msvs_version==2013 and component=="shared_library" and CONFI GURATION_NAME=="Debug"', { | 10 ['OS=="win" and msvs_version==2013 and component=="shared_library" and CONFI GURATION_NAME=="Debug"', { |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 38 '<(PRODUCT_DIR)/msvcr120.dll', | 38 '<(PRODUCT_DIR)/msvcr120.dll', |
| 39 ], | 39 ], |
| 40 }, | 40 }, |
| 41 }], | 41 }], |
| 42 # VS2015 runtimes | 42 # VS2015 runtimes |
| 43 ['OS=="win" and msvs_version==2015 and component=="shared_library" and CONFI GURATION_NAME=="Debug"', { | 43 ['OS=="win" and msvs_version==2015 and component=="shared_library" and CONFI GURATION_NAME=="Debug"', { |
| 44 'variables': { | 44 'variables': { |
| 45 'files': [ | 45 'files': [ |
| 46 '<(PRODUCT_DIR)/x64/msvcp140d.dll', | 46 '<(PRODUCT_DIR)/x64/msvcp140d.dll', |
| 47 '<(PRODUCT_DIR)/x64/vccorlib140d.dll', | 47 '<(PRODUCT_DIR)/x64/vccorlib140d.dll', |
| 48 '<(PRODUCT_DIR)/x64/vcruntime140d.dll', | |
| 49 '<(PRODUCT_DIR)/x64/ucrtbased.dll', | |
| 48 ], | 50 ], |
| 49 }, | 51 }, |
| 50 }], | 52 }], |
| 51 ['OS=="win" and msvs_version==2015 and component=="shared_library" and CONFI GURATION_NAME=="Release"', { | 53 ['OS=="win" and msvs_version==2015 and component=="shared_library" and CONFI GURATION_NAME=="Release"', { |
| 52 'variables': { | 54 'variables': { |
| 53 'files': [ | 55 'files': [ |
| 54 '<(PRODUCT_DIR)/x64/msvcp140.dll', | 56 '<(PRODUCT_DIR)/x64/msvcp140.dll', |
| 55 '<(PRODUCT_DIR)/x64/vccorlib140.dll', | 57 '<(PRODUCT_DIR)/x64/vccorlib140.dll', |
| 58 '<(PRODUCT_DIR)/x64/vcruntime140.dll', | |
| 59 '<(PRODUCT_DIR)/x64/ucrtbase.dll', | |
| 56 ], | 60 ], |
| 57 }, | 61 }, |
| 58 }], | 62 }], |
| 59 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { | 63 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { |
| 60 'variables': { | 64 'variables': { |
| 61 'files': [ | 65 'files': [ |
| 62 '<(PRODUCT_DIR)/msvcp140d.dll', | 66 '<(PRODUCT_DIR)/msvcp140d.dll', |
| 63 '<(PRODUCT_DIR)/vccorlib140d.dll', | 67 '<(PRODUCT_DIR)/vccorlib140d.dll', |
| 68 '<(PRODUCT_DIR)/vcruntime140d.dll', | |
| 69 '<(PRODUCT_DIR)/ucrtbased.dll', | |
| 64 ], | 70 ], |
| 65 }, | 71 }, |
| 66 }], | 72 }], |
| 67 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { | 73 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { |
| 68 'variables': { | 74 'variables': { |
| 69 'files': [ | 75 'files': [ |
| 70 '<(PRODUCT_DIR)/msvcp140.dll', | 76 '<(PRODUCT_DIR)/msvcp140.dll', |
| 71 '<(PRODUCT_DIR)/vccorlib140.dll', | 77 '<(PRODUCT_DIR)/vccorlib140.dll', |
| 78 '<(PRODUCT_DIR)/vcruntime140.dll', | |
| 79 '<(PRODUCT_DIR)/ucrtbase.dll', | |
| 72 ], | 80 ], |
| 73 }, | 81 }, |
| 74 }], | 82 }], |
| 83 ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONF IGURATION_NAME=="Debug or CONFIGURATION_NAME=="Release")', { | |
|
Nico
2016/02/08 20:19:57
target_arch=="ia32" is probably a nicer check for
brucedawson
2016/02/08 21:00:31
Done.
| |
| 84 # 32-bit builds have an x64 directory which also needs Windows 10 | |
| 85 # Universal C Runtime binaries copied over. | |
| 86 'variables': { | |
| 87 'files': [ | |
| 88 '<(PRODUCT_DIR)/x64/api-ms-win-core-console-l1-1-0.dll', | |
| 89 '<(PRODUCT_DIR)/x64/api-ms-win-core-datetime-l1-1-0.dll', | |
| 90 '<(PRODUCT_DIR)/x64/api-ms-win-core-debug-l1-1-0.dll', | |
| 91 '<(PRODUCT_DIR)/x64/api-ms-win-core-errorhandling-l1-1-0.dll', | |
| 92 '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l1-1-0.dll', | |
| 93 '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l1-2-0.dll', | |
| 94 '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l2-1-0.dll', | |
| 95 '<(PRODUCT_DIR)/x64/api-ms-win-core-handle-l1-1-0.dll', | |
| 96 '<(PRODUCT_DIR)/x64/api-ms-win-core-heap-l1-1-0.dll', | |
| 97 '<(PRODUCT_DIR)/x64/api-ms-win-core-interlocked-l1-1-0.dll', | |
| 98 '<(PRODUCT_DIR)/x64/api-ms-win-core-libraryloader-l1-1-0.dll', | |
| 99 '<(PRODUCT_DIR)/x64/api-ms-win-core-localization-l1-2-0.dll', | |
| 100 '<(PRODUCT_DIR)/x64/api-ms-win-core-memory-l1-1-0.dll', | |
| 101 '<(PRODUCT_DIR)/x64/api-ms-win-core-namedpipe-l1-1-0.dll', | |
| 102 '<(PRODUCT_DIR)/x64/api-ms-win-core-processenvironment-l1-1-0.dll', | |
| 103 '<(PRODUCT_DIR)/x64/api-ms-win-core-processthreads-l1-1-0.dll', | |
| 104 '<(PRODUCT_DIR)/x64/api-ms-win-core-processthreads-l1-1-1.dll', | |
| 105 '<(PRODUCT_DIR)/x64/api-ms-win-core-profile-l1-1-0.dll', | |
| 106 '<(PRODUCT_DIR)/x64/api-ms-win-core-rtlsupport-l1-1-0.dll', | |
| 107 '<(PRODUCT_DIR)/x64/api-ms-win-core-string-l1-1-0.dll', | |
| 108 '<(PRODUCT_DIR)/x64/api-ms-win-core-synch-l1-1-0.dll', | |
| 109 '<(PRODUCT_DIR)/x64/api-ms-win-core-synch-l1-2-0.dll', | |
| 110 '<(PRODUCT_DIR)/x64/api-ms-win-core-sysinfo-l1-1-0.dll', | |
| 111 '<(PRODUCT_DIR)/x64/api-ms-win-core-timezone-l1-1-0.dll', | |
| 112 '<(PRODUCT_DIR)/x64/api-ms-win-core-util-l1-1-0.dll', | |
| 113 '<(PRODUCT_DIR)/x64/api-ms-win-crt-conio-l1-1-0.dll', | |
| 114 '<(PRODUCT_DIR)/x64/api-ms-win-crt-convert-l1-1-0.dll', | |
| 115 '<(PRODUCT_DIR)/x64/api-ms-win-crt-environment-l1-1-0.dll', | |
| 116 '<(PRODUCT_DIR)/x64/api-ms-win-crt-filesystem-l1-1-0.dll', | |
| 117 '<(PRODUCT_DIR)/x64/api-ms-win-crt-heap-l1-1-0.dll', | |
| 118 '<(PRODUCT_DIR)/x64/api-ms-win-crt-locale-l1-1-0.dll', | |
| 119 '<(PRODUCT_DIR)/x64/api-ms-win-crt-math-l1-1-0.dll', | |
| 120 '<(PRODUCT_DIR)/x64/api-ms-win-crt-multibyte-l1-1-0.dll', | |
| 121 '<(PRODUCT_DIR)/x64/api-ms-win-crt-private-l1-1-0.dll', | |
| 122 '<(PRODUCT_DIR)/x64/api-ms-win-crt-process-l1-1-0.dll', | |
| 123 '<(PRODUCT_DIR)/x64/api-ms-win-crt-runtime-l1-1-0.dll', | |
| 124 '<(PRODUCT_DIR)/x64/api-ms-win-crt-stdio-l1-1-0.dll', | |
| 125 '<(PRODUCT_DIR)/x64/api-ms-win-crt-string-l1-1-0.dll', | |
| 126 '<(PRODUCT_DIR)/x64/api-ms-win-crt-time-l1-1-0.dll', | |
| 127 '<(PRODUCT_DIR)/x64/api-ms-win-crt-utility-l1-1-0.dll', | |
| 128 ], | |
| 129 }, | |
| 130 }], | |
| 131 ['OS=="win" and msvs_version==2015 and component=="shared_library"', { | |
| 132 # Windows 10 Universal C Runtime binaries. | |
| 133 'variables': { | |
| 134 'files': [ | |
| 135 '<(PRODUCT_DIR)/api-ms-win-core-console-l1-1-0.dll', | |
| 136 '<(PRODUCT_DIR)/api-ms-win-core-datetime-l1-1-0.dll', | |
| 137 '<(PRODUCT_DIR)/api-ms-win-core-debug-l1-1-0.dll', | |
| 138 '<(PRODUCT_DIR)/api-ms-win-core-errorhandling-l1-1-0.dll', | |
| 139 '<(PRODUCT_DIR)/api-ms-win-core-file-l1-1-0.dll', | |
| 140 '<(PRODUCT_DIR)/api-ms-win-core-file-l1-2-0.dll', | |
| 141 '<(PRODUCT_DIR)/api-ms-win-core-file-l2-1-0.dll', | |
| 142 '<(PRODUCT_DIR)/api-ms-win-core-handle-l1-1-0.dll', | |
| 143 '<(PRODUCT_DIR)/api-ms-win-core-heap-l1-1-0.dll', | |
| 144 '<(PRODUCT_DIR)/api-ms-win-core-interlocked-l1-1-0.dll', | |
| 145 '<(PRODUCT_DIR)/api-ms-win-core-libraryloader-l1-1-0.dll', | |
| 146 '<(PRODUCT_DIR)/api-ms-win-core-localization-l1-2-0.dll', | |
| 147 '<(PRODUCT_DIR)/api-ms-win-core-memory-l1-1-0.dll', | |
| 148 '<(PRODUCT_DIR)/api-ms-win-core-namedpipe-l1-1-0.dll', | |
| 149 '<(PRODUCT_DIR)/api-ms-win-core-processenvironment-l1-1-0.dll', | |
| 150 '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-0.dll', | |
| 151 '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-1.dll', | |
| 152 '<(PRODUCT_DIR)/api-ms-win-core-profile-l1-1-0.dll', | |
| 153 '<(PRODUCT_DIR)/api-ms-win-core-rtlsupport-l1-1-0.dll', | |
| 154 '<(PRODUCT_DIR)/api-ms-win-core-string-l1-1-0.dll', | |
| 155 '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-1-0.dll', | |
| 156 '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-2-0.dll', | |
| 157 '<(PRODUCT_DIR)/api-ms-win-core-sysinfo-l1-1-0.dll', | |
| 158 '<(PRODUCT_DIR)/api-ms-win-core-timezone-l1-1-0.dll', | |
| 159 '<(PRODUCT_DIR)/api-ms-win-core-util-l1-1-0.dll', | |
| 160 '<(PRODUCT_DIR)/api-ms-win-crt-conio-l1-1-0.dll', | |
| 161 '<(PRODUCT_DIR)/api-ms-win-crt-convert-l1-1-0.dll', | |
| 162 '<(PRODUCT_DIR)/api-ms-win-crt-environment-l1-1-0.dll', | |
| 163 '<(PRODUCT_DIR)/api-ms-win-crt-filesystem-l1-1-0.dll', | |
| 164 '<(PRODUCT_DIR)/api-ms-win-crt-heap-l1-1-0.dll', | |
| 165 '<(PRODUCT_DIR)/api-ms-win-crt-locale-l1-1-0.dll', | |
| 166 '<(PRODUCT_DIR)/api-ms-win-crt-math-l1-1-0.dll', | |
| 167 '<(PRODUCT_DIR)/api-ms-win-crt-multibyte-l1-1-0.dll', | |
| 168 '<(PRODUCT_DIR)/api-ms-win-crt-private-l1-1-0.dll', | |
| 169 '<(PRODUCT_DIR)/api-ms-win-crt-process-l1-1-0.dll', | |
| 170 '<(PRODUCT_DIR)/api-ms-win-crt-runtime-l1-1-0.dll', | |
| 171 '<(PRODUCT_DIR)/api-ms-win-crt-stdio-l1-1-0.dll', | |
| 172 '<(PRODUCT_DIR)/api-ms-win-crt-string-l1-1-0.dll', | |
| 173 '<(PRODUCT_DIR)/api-ms-win-crt-time-l1-1-0.dll', | |
| 174 '<(PRODUCT_DIR)/api-ms-win-crt-utility-l1-1-0.dll', | |
| 175 ], | |
| 176 }, | |
| 177 }], | |
| 178 | |
| 75 ], | 179 ], |
| 76 } | 180 } |
| OLD | NEW |