commit 1be9889efd32964b21975d717083b65555f75329
author Mike Klein <mtklein@chromium.org> Thu Jun 07 14:27:49 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 07 18:45:35 2018 +0000
tree 5d57c2b51ee2a3d739738aa400290fd3e81cd394
parent 0fdd840919c62b52d431668bdd1aa9d8b6889514

roll to latest win_toolchain

Change-Id: I12da32189b41a3431309bdcb296abf1f4a8f5877
Reviewed-on: https://skia-review.googlesource.com/132930
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@chromium.org>

infra/bots/bot.py

diff --git a/infra/bots/bot.py b/infra/bots/bot.py
index 5821a53..19688cf 100644
--- a/infra/bots/bot.py
+++ b/infra/bots/bot.py
@@ -36,14 +36,14 @@
   call('{ninja}/ninja -C skcms -k 0'.format(ninja=ninja))
 
 else:  # Windows
-  win_toolchain = os.path.realpath(sys.argv[2]) + '\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272'
-  os.environ['PATH'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.11.25503\\bin\\HostX64\\x64;' + os.environ['PATH']
-  os.environ['INCLUDE'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.11.25503\\include;'
-  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.15063.0\\shared;'
-  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.15063.0\\ucrt;'
-  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.15063.0\\um;'
-  os.environ['LIB'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.11.25503\\lib\\x64;'
-  os.environ['LIB'] += win_toolchain + '\\win_sdk\\Lib\\10.0.15063.0\\um\\x64;'
-  os.environ['LIB'] += win_toolchain + '\\win_sdk\\Lib\\10.0.15063.0\\ucrt\\x64;'
+  win_toolchain = os.path.realpath(sys.argv[2]) + '\\depot_tools\\win_toolchain\\vs_files\\5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c'
+  os.environ['PATH'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.14.26428\\bin\\HostX64\\x64;' + os.environ['PATH']
+  os.environ['INCLUDE'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.14.26428\\include;'
+  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.17134.0\\shared;'
+  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.17134.0\\ucrt;'
+  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.17134.0\\um;'
+  os.environ['LIB'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.14.26428\\lib\\x64;'
+  os.environ['LIB'] += win_toolchain + '\\win_sdk\\Lib\\10.0.17134.0\\um\\x64;'
+  os.environ['LIB'] += win_toolchain + '\\win_sdk\\Lib\\10.0.17134.0\\ucrt\\x64;'
 
   call('{ninja}\\ninja.exe -C skcms -f msvs.ninja -k 0'.format(ninja=ninja))

infra/bots/gen_tasks.go

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 97d3949..716d484 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -63,7 +63,7 @@
 			&specs.CipdPackage{
 				Name:    "skia/bots/win_toolchain",
 				Path:    "t",
-				Version: "version:7",
+				Version: "version:8",
 			},
 			&specs.CipdPackage{
 				Name:    "skia/bots/clang_win",

infra/bots/tasks.json

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index cb5b537..78a4c23 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -101,7 +101,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:7"
+          "version": "version:8"
         },
         {
           "name": "skia/bots/clang_win",