Start including 'winrt' in Windows toolchain

Recent versions of ANGLE require this. See:

  https://skia-review.googlesource.com/c/6698/

This also updates us to the latest version of the Windows SDK,
2015 Update 3 (Windows 10 SDK).

BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI,Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan,Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release

Change-Id: I42c8cabc87717f8695763f2c5573b27ab8ab65be
Reviewed-on: https://skia-review.googlesource.com/6801
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 32794ab..42bb8c9 100644 (file)
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -84,9 +84,9 @@ config("default") {
       "$windk/../Windows Kits/8.1/Include/um",
 
       # For builds using win_toolchain asset.
-      "$windk/win_sdk/Include/10.0.10586.0/shared",
-      "$windk/win_sdk/Include/10.0.10586.0/ucrt",
-      "$windk/win_sdk/Include/10.0.10586.0/um",
+      "$windk/win_sdk/Include/10.0.14393.0/shared",
+      "$windk/win_sdk/Include/10.0.14393.0/ucrt",
+      "$windk/win_sdk/Include/10.0.14393.0/um",
     ]
     lib_dirs = [
       # For local builds.
@@ -94,8 +94,8 @@ config("default") {
       "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu",
 
       # For builds using win_toolchain asset.
-      "$windk/win_sdk/Lib/10.0.10586.0/ucrt/$target_cpu",
-      "$windk/win_sdk/Lib/10.0.10586.0/um/$target_cpu",
+      "$windk/win_sdk/Lib/10.0.14393.0/ucrt/$target_cpu",
+      "$windk/win_sdk/Lib/10.0.14393.0/um/$target_cpu",
     ]
     if (target_cpu == "x86") {
       lib_dirs += [ "$windk/VC/lib" ]

diff --git a/infra/bots/assets/win_toolchain/VERSION b/infra/bots/assets/win_toolchain/VERSION
index 7813681..62f9457 100644 (file)
--- a/infra/bots/assets/win_toolchain/VERSION
+++ b/infra/bots/assets/win_toolchain/VERSION
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file

diff --git a/infra/bots/assets/win_toolchain/create.py b/infra/bots/assets/win_toolchain/create.py
index 4ec20d4..e96cde9 100755 (executable)
--- a/infra/bots/assets/win_toolchain/create.py
+++ b/infra/bots/assets/win_toolchain/create.py
@@ -29,7 +29,6 @@ IGNORE_LIST = [
   'App Certification Kit',
   'Debuggers',
   'Extension SDKs',
-  'winrt',
   'DesignTime',
   'AccChecker',
 ]

diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index af400d9..8d0fa4c 100644 (file)
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -40,7 +40,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
     clang_linux   = str(self.m.vars.slave_dir.join('clang_linux'))
     win_toolchain = str(self.m.vars.slave_dir.join(
       't', 'depot_tools', 'win_toolchain', 'vs_files',
-      '95ddda401ec5678f15eeed01d2bee08fcbc5ee97'))
+      'd3cb0e37bdd120ad0ac4650b674b09e81be45616'))
     win_vulkan_sdk = str(self.m.vars.slave_dir.join('win_vulkan_sdk'))
 
     cc, cxx = None, None

diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json
index 155d46b..a8d496f 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json
@@ -92,7 +92,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug",
-      "--args=skia_use_angle=true target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=skia_use_angle=true target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
index 83c5f09..d86b258 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
@@ -92,7 +92,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug",
-      "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json
index 454ad95..9af4feb 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json
@@ -92,7 +92,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
-      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
index e17720f..8e2519c 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
@@ -92,7 +92,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release",
-      "--args=is_debug=false skia_use_gdi=true target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=is_debug=false skia_use_gdi=true target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
index ea185df..89eef19 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
@@ -92,7 +92,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release",
-      "--args=is_debug=false target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=is_debug=false target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
index fb8fc4b..7d336f0 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
@@ -92,7 +92,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan\\Release_x64",
-      "--args=is_debug=false skia_vulkan_sdk=\"[START_DIR]\\win_vulkan_sdk\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=is_debug=false skia_vulkan_sdk=\"[START_DIR]\\win_vulkan_sdk\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json
index 5ae2687..f6b1c97 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json
+++ b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json
@@ -98,7 +98,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
-      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json
index a25dbc2..e1d93a1 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json
+++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json
@@ -118,7 +118,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
-      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
index 212497a..b4c1c07 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
+++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
@@ -120,7 +120,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
-      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
index 896d8f4..880e002 100644 (file)
--- a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
@@ -118,7 +118,7 @@
       "gn.bat",
       "gen",
       "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot\\Debug",
-      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+      "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index d5d28f8..18813bd 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -2835,7 +2835,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -2867,7 +2867,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -2899,7 +2899,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -2931,7 +2931,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -2963,7 +2963,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -2995,7 +2995,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3027,7 +3027,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3059,7 +3059,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3091,7 +3091,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3123,7 +3123,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3155,7 +3155,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         },
         {
           "name": "skia/bots/win_vulkan_sdk",
@@ -3192,7 +3192,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3224,7 +3224,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3256,7 +3256,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "dimensions": [
@@ -3288,7 +3288,7 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "t",
-          "version": "version:5"
+          "version": "version:6"
         },
         {
           "name": "skia/bots/win_vulkan_sdk",