switch to generated toolchain fixups

third_party/toolchains/BUILD

@@ -52,25 +52,21 @@ platform(
 # The default toolchain suite for RBE windows, pass it to --crosstool_top
 alias(
     name = "rbe_windows_default_toolchain_suite",
-    actual = "//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019:toolchain",
+    actual = "//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/cc:toolchain",
 )
 
 # The default CC toolchain suite for RBE windows
 alias(
     name = "rbe_windows_default_cc_toolchain",
-    actual = "//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019:cc-toolchain-x64_windows",
+    actual = "//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/config:cc-toolchain",
 )
 
 # The default platform for RBE windows
 platform(
     name = "rbe_windows_default_platform",
-    constraint_values = [
-        "@platforms//cpu:x86_64",
-        "@platforms//os:windows",
-    ],
+    # Inherit from the platform target generated by 'rbe_configs_gen'.
+	parents = ["//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/config:platform"],
     exec_properties = create_rbe_exec_properties_dict(
-        # See rbe_win2019/Dockerfile for image details
-        container_image = "docker://gcr.io/grpc-testing/rbe_windows2019@sha256:41772e8eeb9dd8c8b996bf32d58164d84b2315c8e81e634bbff5a0216b7f52fd",
         os_family = "Windows",
         # by default, all RBE actions will run on "small" workers.
         labels = {"os": "windows_2019", "machine_size": "small"},