aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/tasks.json
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-12-07 16:16:21 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-08 01:46:30 +0000
commit852ca318a16f9c455d2bed3efb2063dff0e4d068 (patch)
tree33a87ecf931b014864cb214ab88685683f033df7 /infra/bots/tasks.json
parent43646533fa6fb7cd6724cf00f6b8af15ac1649ea (diff)
Updated MSVC toolchain to 2017, and further refactored GN
'windk' is no longer a thing. There are two separate variables to point at your compiler (win_vc), and SDK (win_sdk). 'msvc' is no longer a thing, either. By default, we look for 2017 and then 2015 (in the default locations). If neither is located, use an assert to let users know they should set win_vc. Then, detect if win_vc points at a 2017 or 2015 installation, and configure it automatically. Because the toolchain is now 2017, update the GN files to handle building x86 in that configuration. In fact, we only support x86 builds (with 2017 or 2015) using the toolchain assets. Keep a 2015 toolchain around as a new asset, so we can add bot coverage. Docs-Preview: https://skia.org/?cl=81841 Bug: skia: Change-Id: I8c68a6f949e54c0e798a219450bbb9406f8dc6ac Reviewed-on: https://skia-review.googlesource.com/81841 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'infra/bots/tasks.json')
-rw-r--r--infra/bots/tasks.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 6c2a3aca00..ee7c0b3360 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5364,7 +5364,7 @@
{
"name": "skia/bots/win_toolchain",
"path": "t",
- "version": "version:6"
+ "version": "version:7"
}
],
"dimensions": [