Revert "Switch Win Exceptions Build to Clang."

This reverts commit e1cb4778c70a6bef543a8936c5521a71a037f551.

Reason for revert: Need to revert dependency https://skia-review.googlesource.com/c/skia/+/114093

Original change's description:
> Switch Win Exceptions Build to Clang.
> 
> No-Try: true
> Change-Id: I119c7853299b6eef65f991b41cbb2afb0a35f431
> Reviewed-on: https://skia-review.googlesource.com/113673
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,benjaminwagner@google.com

Change-Id: I36f4c6cdf890043d4b77b8d5347b4752f58ebd33
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/114420
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

6 files changed, 50 insertions, 63 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index ae21c46cd3..371ccf6955 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -75,7 +75,6 @@
   "Build-Mac-Clang-x86_64-Release-TSAN",
   "Build-Win-Clang-arm64-Release-Android",
   "Build-Win-Clang-x86-Debug",
-  "Build-Win-Clang-x86-Debug-Exceptions",
   "Build-Win-Clang-x86-Release",
   "Build-Win-Clang-x86_64-Debug",
   "Build-Win-Clang-x86_64-Debug-ANGLE",
@@ -86,6 +85,7 @@
   "Build-Win-Clang-x86_64-Release-UBSAN",
   "Build-Win-Clang-x86_64-Release-Vulkan",
   "Build-Win-MSVC-x86-Debug",
+  "Build-Win-MSVC-x86-Debug-Exceptions",
   "Build-Win-MSVC-x86-Release",
   "Build-Win-MSVC-x86_64-Debug",
   "Build-Win-MSVC-x86_64-Debug-Vulkan",
@@ -475,8 +475,8 @@
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
-  "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
+  "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
index 3f00b4c574..bf08caa1a5 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
@@ -10,7 +10,7 @@
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions"
+      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions"
     },
     "infra_step": true,
     "name": "fetch-gn"
@@ -19,15 +19,15 @@
     "cmd": [
       "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe",
       "gen",
-      "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug",
-      "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
+      "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug",
+      "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions"
+      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions"
     },
     "name": "gn gen"
   },
@@ -37,14 +37,14 @@
       "-k",
       "0",
       "-C",
-      "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug"
+      "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug"
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions"
+      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions"
     },
     "name": "ninja"
   },
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index b5ac5cdc53..4ebd98a9a2 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -81,10 +81,10 @@ TEST_BUILDERS = [
   'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
   'Build-Mac-Clang-x86_64-Debug-Metal',
   'Build-Win-Clang-arm64-Release-Android',
-  'Build-Win-Clang-x86-Debug-Exceptions',
   'Build-Win-Clang-x86_64-Debug-GDI',
   'Build-Win-Clang-x86_64-Release',
   'Build-Win-Clang-x86_64-Release-Vulkan',
+  'Build-Win-MSVC-x86-Debug-Exceptions',
   'Housekeeper-PerCommit-CheckGeneratedFiles',
   'Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android',
   'Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android',
diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
index 38e417f844..1d8d3e1c3c 100644
--- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json
+++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
@@ -102,11 +102,9 @@
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {
       "BUILDTYPE": "Debug",
-      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "CXX": "/usr/bin/clang++",
       "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions"
+      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
     },
     "infra_step": true,
     "name": "fetch-gn"
@@ -115,17 +113,15 @@
     "cmd": [
       "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe",
       "gen",
-      "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug",
-      "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
+      "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug",
+      "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {
       "BUILDTYPE": "Debug",
-      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "CXX": "/usr/bin/clang++",
       "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions"
+      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
     },
     "name": "gn gen"
   },
@@ -135,16 +131,14 @@
       "-k",
       "0",
       "-C",
-      "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug"
+      "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug"
     ],
     "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
     "env": {
       "BUILDTYPE": "Debug",
-      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "CXX": "/usr/bin/clang++",
       "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions"
+      "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
     },
     "name": "ninja"
   },
@@ -153,7 +147,7 @@
       "python",
       "-u",
       "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products_whitelist:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print 'Copying build product %s to %s' % (f, dst_path)\n    shutil.move(f, dst_path)\n",
-      "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug",
+      "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug",
       "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
     ],
     "infra_step": true,
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index 114db7259e..1ad4d7f12a 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -109,10 +109,10 @@ TEST_BUILDERS = [
   'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
   'Build-Mac-Clang-x86_64-Release',
   'Build-Win-Clang-arm64-Release-Android',
-  'Build-Win-Clang-x86-Debug-Exceptions',
   'Build-Win-Clang-x86_64-Release-Vulkan',
   'Build-Win-MSVC-x86-Debug',
   'Build-Win-MSVC-x86-Debug-ANGLE',
+  'Build-Win-MSVC-x86-Debug-Exceptions',
   'Build-Win-MSVC-x86-Release-GDI',
 ]
 
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 06f05c9474..4c02b13062 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -461,12 +461,6 @@
         "Build-Win-Clang-x86-Debug"
       ]
     },
-    "Build-Win-Clang-x86-Debug-Exceptions": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-Clang-x86-Debug-Exceptions"
-      ]
-    },
     "Build-Win-Clang-x86-Release": {
       "priority": 0.8,
       "tasks": [
@@ -527,6 +521,12 @@
         "Build-Win-MSVC-x86-Debug"
       ]
     },
+    "Build-Win-MSVC-x86-Debug-Exceptions": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Win-MSVC-x86-Debug-Exceptions"
+      ]
+    },
     "Build-Win-MSVC-x86-Release": {
       "priority": 0.8,
       "tasks": [
@@ -5398,40 +5398,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-Clang-x86-Debug-Exceptions": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/clang_win",
-          "path": "clang_win",
-          "version": "version:4"
-        }
-      ],
-      "dependencies": [
-        "Housekeeper-PerCommit-IsolateWinToolchain"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-Clang-x86-Debug-Exceptions",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-Clang-x86-Release": {
       "cipd_packages": [
         {
@@ -5767,6 +5733,33 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Win-MSVC-x86-Debug-Exceptions": {
+      "dependencies": [
+        "Housekeeper-PerCommit-IsolateWinToolchain"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highcpu-64",
+        "os:Windows-2016Server-14393",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "compile",
+        "repository=<(REPO)",
+        "buildername=Build-Win-MSVC-x86-Debug-Exceptions",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Win-MSVC-x86-Release": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateWinToolchain"