Bug 1572381 - Use the same tooltool manifest for webrender as for other tasks using vs2017. r=nalexander

It turns out this task doesn't use cmake or ninja (anymore?).

Differential Revision: https://phabricator.services.mozilla.com/D41164

--HG--
extra : moz-landing-system : lando

browser/config/tooltool-manifests/win64/webrender.manifest

@@ -1,26 +0,0 @@
-[
-  {
-    "version": "Visual Studio 2017 15.8.4 / SDK 10.0.17134.0",
-    "digest": "ecf1e03f6f98f86775059a43f9e7dc7e326f6643d7c08962d9f614e4f5a65b1ca63fa1cfeb0f1a3c2474bf0d4318dda960b378beb2a44ecf8a91111207f4ece5",
-    "size": 349626009,
-    "algorithm": "sha512",
-    "filename": "vs2017_15.8.4.zip",
-    "unpack": true
-  },
-  {
-    "version": "CMake 3.6.2 repack",
-    "size": 19832889,
-    "digest": "39b0508b60f655969d1b54c76753b14b5b2e92dab58613c835aed798a6aeb9077a7df78aebc011c2c753661fdc15007d3353c0c8773a53148380e2ec02afb629",
-    "algorithm": "sha512",
-    "filename": "cmake362.zip",
-    "unpack": true
-  },
-  {
-    "version": "Ninja 1.7.1",
-    "size": 184821,
-    "digest": "e4f9a1ae624a2630e75264ba37d396d9c7407d6e6aea3763056210ba6e1387908bd31cf4037a6a3661a418e86c4d2761e0c333e6a3bd0d66549d2b0d72d3f43b",
-    "algorithm": "sha512",
-    "filename": "ninja171.zip",
-    "unpack": true
-  }
-]

taskcluster/ci/webrender/kind.yml

@@ -221,7 +221,7 @@ jobs:
         worker:
             max-run-time: 5400
             env:
-                TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/win64/webrender.manifest'
+                TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/win64/vs2017.manifest'
         fetches:
             toolchain:
                 - win64-rust

taskcluster/scripts/misc/wrench-windows-tests.sh

@@ -10,9 +10,9 @@ set -x -e -v
 
 cd $GECKO_PATH
 
-# This will download the rustc, cmake, ninja, MSVC, and wrench-deps artifacts.
+# This will download the rustc, MSVC, and wrench-deps artifacts.
 . taskcluster/scripts/misc/tooltool-download.sh
-export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin:$MOZ_FETCHES_DIR/cmake/bin:$MOZ_FETCHES_DIR/ninja/bin
+export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin
 
 .  taskcluster/scripts/misc/vs-setup.sh
 
@@ -25,7 +25,6 @@ powershell.exe 'iex (Get-Content -Raw ci-scripts\set-screenresolution.ps1); Set-
 
 # Run the CI scripts
 export CARGOFLAGS='--verbose --frozen'
-export FREETYPE_CMAKE_GENERATOR=Ninja
 cmd.exe /c 'ci-scripts\windows-tests.cmd'
 
 . $GECKO_PATH/taskcluster/scripts/misc/vs-cleanup.sh