[build] Use MSVS 2015 by default.

BUG=chromium:603131
LOG=y

Review URL: https://codereview.chromium.org/1886983002

Cr-Commit-Position: refs/heads/master@{#35487}

build/config/win/msvs_dependencies.isolate

@@ -46,6 +46,8 @@
         'files': [
           '<(PRODUCT_DIR)/x64/msvcp140d.dll',
           '<(PRODUCT_DIR)/x64/vccorlib140d.dll',
+          '<(PRODUCT_DIR)/x64/vcruntime140d.dll',
+          '<(PRODUCT_DIR)/x64/ucrtbased.dll',
         ],
       },
     }],
@@ -54,6 +56,8 @@
         'files': [
           '<(PRODUCT_DIR)/x64/msvcp140.dll',
           '<(PRODUCT_DIR)/x64/vccorlib140.dll',
+          '<(PRODUCT_DIR)/x64/vcruntime140.dll',
+          '<(PRODUCT_DIR)/x64/ucrtbase.dll',
         ],
       },
     }],
@@ -62,6 +66,8 @@
         'files': [
           '<(PRODUCT_DIR)/msvcp140d.dll',
           '<(PRODUCT_DIR)/vccorlib140d.dll',
+          '<(PRODUCT_DIR)/vcruntime140d.dll',
+          '<(PRODUCT_DIR)/ucrtbased.dll',
         ],
       },
     }],
@@ -70,8 +76,105 @@
         '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" and target_arch=="ia32"', {
+      # 32-bit builds have an x64 directory which also needs Windows 10
+      # Universal C Runtime binaries copied over.
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-console-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-datetime-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-debug-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-errorhandling-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l1-2-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l2-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-handle-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-heap-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-interlocked-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-libraryloader-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-localization-l1-2-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-memory-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-namedpipe-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-processenvironment-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-processthreads-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-processthreads-l1-1-1.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-profile-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-rtlsupport-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-string-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-synch-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-synch-l1-2-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-sysinfo-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-timezone-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-core-util-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-conio-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-convert-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-environment-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-filesystem-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-heap-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-locale-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-math-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-multibyte-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-private-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-process-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-runtime-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-stdio-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-string-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-time-l1-1-0.dll',
+          '<(PRODUCT_DIR)/x64/api-ms-win-crt-utility-l1-1-0.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 newline at end of file

build/get_landmines.py

@@ -27,6 +27,7 @@ def main():
   print 'Switching to pinned msvs toolchain.'
   print 'Clobbering to hopefully resolve problem with mksnapshot'
   print 'Clobber after ICU roll.'
+  print 'Switching to MSVS 2015.'
   return 0
 
 

build/isolate.gypi

@@ -87,7 +87,7 @@
       'conditions': [
         ['OS=="win"', {
           'action': [
-            '--config-variable', 'msvs_version=2013',
+            '--config-variable', 'msvs_version=<(MSVS_VERSION)',
           ],
         }, {
           'action': [

build/standalone.gypi

@@ -796,6 +796,11 @@
               '_HAS_EXCEPTIONS=0',
             ],
           }],
+          ['component=="shared_library"', {
+            'msvs_disabled_warnings': [
+              4251,  # class 'std::xx' needs to have dll-interface.
+            ],
+          }],
         ],
         'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
         'msvs_disabled_warnings': [

build/vs_toolchain.py

@@ -24,8 +24,8 @@ json_data_file = os.path.join(script_dir, 'win_toolchain.json')
 import gyp
 
 
-# Use MSVS2013 as the default toolchain.
-CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2013'
+# Use MSVS2015 as the default toolchain.
+CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2015'
 
 
 def SetEnvironmentAndGetRuntimeDllDirs():