Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(419)

Unified Diff: gypfiles/win/msvs_dependencies.isolate

Issue 2538493007: Revert of [build] Use MSVS 2015 by default. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gni/isolate.gni ('k') | src/base.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gypfiles/win/msvs_dependencies.isolate
diff --git a/gypfiles/win/msvs_dependencies.isolate b/gypfiles/win/msvs_dependencies.isolate
deleted file mode 100644
index 79ae11a1ae959672e639258eac3111b3c52cff25..0000000000000000000000000000000000000000
--- a/gypfiles/win/msvs_dependencies.isolate
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# TODO(machenbach): Remove this when crbug.com/669910 is resolved.
-{
- 'conditions': [
- # Copy the VS runtime DLLs into the isolate so that they
- # don't have to be preinstalled on the target machine.
- #
- # VS2013 runtimes
- ['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp120d.dll',
- '<(PRODUCT_DIR)/msvcr120d.dll',
- ],
- },
- }],
- ['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp120.dll',
- '<(PRODUCT_DIR)/msvcr120.dll',
- ],
- },
- }],
- # VS2015 runtimes
- ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp140d.dll',
- '<(PRODUCT_DIR)/vccorlib140d.dll',
- '<(PRODUCT_DIR)/vcruntime140d.dll',
- '<(PRODUCT_DIR)/ucrtbased.dll',
- ],
- },
- }],
- ['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp140.dll',
- '<(PRODUCT_DIR)/vccorlib140.dll',
- '<(PRODUCT_DIR)/vcruntime140.dll',
- '<(PRODUCT_DIR)/ucrtbase.dll',
- ],
- },
- }],
- ['OS=="win" and msvs_version==2015 and component=="shared_library"', {
- # Windows 10 Universal C Runtime binaries.
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/api-ms-win-core-console-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-datetime-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-debug-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-errorhandling-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-file-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-file-l1-2-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-file-l2-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-handle-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-heap-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-interlocked-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-libraryloader-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-localization-l1-2-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-memory-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-namedpipe-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-processenvironment-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-1.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-profile-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-rtlsupport-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-string-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-2-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-sysinfo-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-timezone-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-util-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-conio-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-convert-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-environment-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-filesystem-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-heap-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-locale-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-math-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-multibyte-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-private-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-process-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-runtime-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-stdio-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-string-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-time-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-utility-l1-1-0.dll',
- ],
- },
- }],
- ],
-}
« no previous file with comments | « gni/isolate.gni ('k') | src/base.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698