[Python Bazel] Use `PyInfo` provider and `py_*` rules from rules_python (#37995)

The native one will be removed soon (Bazel 8?).

Closes #37995

PiperOrigin-RevId: 690671136

bazel/python_rules.bzl

@@ -14,6 +14,7 @@
 """Generates and compiles Python gRPC stubs from proto_library rules."""
 
 load("@rules_proto//proto:defs.bzl", "ProtoInfo")
+load("@rules_python//python:py_info.bzl", "PyInfo")
 load(
     "//bazel:protobuf.bzl",
     "declare_out_files",

examples/objective-c/BUILD

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@com_github_grpc_grpc//bazel:objc_grpc_library.bzl", "objc_grpc_library")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
+load("@com_github_grpc_grpc//bazel:objc_grpc_library.bzl", "objc_grpc_library")
 
 licenses(["notice"])
 

examples/python/auth/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
+
 filegroup(
     name = "_credentials_files",
     testonly = 1,

examples/python/cancellation/BUILD.bazel

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 package(default_testonly = 1)

examples/python/compression/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
+
 py_binary(
     name = "server",
     srcs = ["server.py"],

examples/python/data_transmission/BUILD

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary")
+
 licenses(["notice"])
 
 py_binary(

examples/python/debug/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
+
 package(default_testonly = 1)
 
 py_binary(

examples/python/errors/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 py_library(
     name = "client",

examples/python/multiprocessing/BUILD

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 proto_library(

examples/python/observability/csm/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_binary")
 
 # TODO(xuanwn): Instead of using Bazel build, we should pip install all dependencies
 # once we have a released version of grpcio-csm-observability.

examples/python/wait_for_ready/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
+
 package(default_testonly = 1)
 
 py_binary(

src/python/grpcio/grpc/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/_cython/BUILD.bazel

@@ -1,5 +1,3 @@
-load("//bazel:cython_library.bzl", "pyx_library")
-
 # Copyright 2021 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ load("//bazel:cython_library.bzl", "pyx_library")
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("//bazel:cython_library.bzl", "pyx_library")
+
 package(default_visibility = ["//visibility:public"])
 
 genrule(

src/python/grpcio/grpc/experimental/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/framework/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/framework/common/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/framework/foundation/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/framework/interfaces/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/framework/interfaces/base/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio/grpc/framework/interfaces/face/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio_admin/grpc_admin/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio_channelz/grpc_channelz/v1/BUILD.bazel

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

src/python/grpcio_csds/grpc_csds/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio_csm_observability/grpc_csm_observability/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library")
 
 package(default_visibility = ["//:__subpackages__"])
 

src/python/grpcio_health_checking/grpc_health/v1/BUILD.bazel

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

src/python/grpcio_observability/grpc_observability/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library")
 load("//bazel:cython_library.bzl", "pyx_library")
 
 package(default_visibility = ["//visibility:private"])

src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

src/python/grpcio_status/grpc_status/BUILD.bazel

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library")
 
 package(default_visibility = ["//visibility:public"])
 

src/python/grpcio_tests/tests/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 py_library(
     name = "bazel_namespace_package_hack",
     srcs = ["bazel_namespace_package_hack.py"],

src/python/grpcio_tests/tests/admin/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
+
 py_test(
     name = "admin_test",
     size = "small",

src/python/grpcio_tests/tests/channelz/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_test")
+
 package(default_visibility = ["//visibility:public"])
 
 py_test(

src/python/grpcio_tests/tests/csds/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
+
 py_test(
     name = "csds_test",
     size = "small",

src/python/grpcio_tests/tests/fork/BUILD.bazel

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_test")
 load("//bazel:cython_library.bzl", "pyx_library")
 
 pyx_library(

src/python/grpcio_tests/tests/health_check/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_test")
+
 package(default_visibility = ["//visibility:public"])
 
 py_test(

src/python/grpcio_tests/tests/interop/BUILD.bazel

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
 
 package(default_visibility = ["//visibility:public"])
 

src/python/grpcio_tests/tests/observability/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 package(default_visibility = ["//visibility:public"])
 

src/python/grpcio_tests/tests/qps/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_library")
+
 package(
     default_testonly = 1,
     default_visibility = ["//visibility:public"],

src/python/grpcio_tests/tests/reflection/BUILD.bazel

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_test")
 
 package(default_visibility = ["//visibility:public"])
 

src/python/grpcio_tests/tests/status/BUILD.bazel

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_test")
 
 package(default_visibility = ["//visibility:public"])
 

src/python/grpcio_tests/tests/stress/BUILD.bazel

@@ -1,5 +1,3 @@
-load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
-
 # Copyright 2021 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +11,9 @@ load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_grpc_library", "py_pro
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:defs.bzl", "py_binary")
 
 proto_library(
     name = "unary_stream_benchmark_proto",

src/python/grpcio_tests/tests/testing/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio_tests/tests/unit/BUILD.bazel

@@ -11,8 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-load("//bazel:internal_python_rules.bzl", "internal_py_grpc_test")
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library")
+load("//bazel:internal_python_rules.bzl", "internal_py_grpc_test")
 
 package(default_visibility = ["//visibility:public"])
 

src/python/grpcio_tests/tests/unit/_cython/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
+
 package(default_visibility = ["//visibility:public"])
 
 GRPCIO_TESTS_UNIT_CYTHON = [

src/python/grpcio_tests/tests/unit/framework/common/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio_tests/tests/unit/framework/foundation/BUILD.bazel

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
+
 package(default_visibility = ["//visibility:public"])
 
 py_library(

src/python/grpcio_tests/tests_aio/benchmark/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_library")
+
 package(
     default_testonly = 1,
     default_visibility = ["//visibility:public"],

src/python/grpcio_tests/tests_aio/channelz/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
+
 package(default_visibility = ["//visibility:public"])
 
 py_test(

src/python/grpcio_tests/tests_aio/health_check/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
+
 package(default_testonly = 1)
 
 py_test(

src/python/grpcio_tests/tests_aio/interop/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
 
 package(default_testonly = 1)
 

src/python/grpcio_tests/tests_aio/reflection/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
+
 package(default_testonly = 1)
 
 py_test(

src/python/grpcio_tests/tests_aio/status/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_test")
 
 py_test(
     name = "grpc_status_test",

src/python/grpcio_tests/tests_aio/unit/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
+
 package(
     default_testonly = 1,
     default_visibility = ["//visibility:public"],

src/python/grpcio_tests/tests_py3_only/interop/BUILD.bazel

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
 
 py_binary(
     name = "xds_interop_client",

src/python/grpcio_tests/tests_py3_only/unit/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
+
 package(
     default_testonly = True,
 )

test/distrib/bazel/cpp/protos/BUILD

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 licenses(["notice"])
 

test/distrib/bazel/python/BUILD

@@ -14,12 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load(
     "@com_github_grpc_grpc//bazel:python_rules.bzl",
     "py_grpc_library",
     "py_proto_library",
 )
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 load("//:python_rules_test.bzl", "python_rules_test_suite")
 
 package(

test/distrib/bazel/python/namespaced/upper/example/BUILD

@@ -14,12 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load(
     "@com_github_grpc_grpc//bazel:python_rules.bzl",
     "py_grpc_library",
     "py_proto_library",
 )
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:defs.bzl", "py_test")
 
 _IMPORT_PREFIX = "foo/bar"
 

test/distrib/bazel/python/python_rules_test.bzl

@@ -14,6 +14,7 @@
 """Bazel rule tests of bazel/python_rules.bzl"""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+load("@rules_python//python:py_info.bzl", "PyInfo")
 
 def _assert_in(env, item, container):
     asserts.true(

third_party/py/BUILD

@@ -1,5 +1,5 @@
 exports_files([
     "BUILD.tpl",
     "python_configure.bzl",
-    "variety.tpl"
+    "variety.tpl",
 ])

third_party/toolchains/BUILD

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe_exec_properties_dict")
+
 licenses(["notice"])  # Apache v2
 
 package(default_visibility = ["//visibility:public"])
 
-load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe_exec_properties_dict")
-
 # The default toolchain suite for RBE linux, pass it to --crosstool_top
 alias(
     name = "rbe_linux_default_toolchain_suite",
@@ -32,10 +32,8 @@ alias(
 
 # The default platform for RBE Linux
 platform(
-	name = "rbe_linux_default_platform",
+    name = "rbe_linux_default_platform",
-    # Inherit from the platform target generated by 'rbe_configs_gen'.
+    exec_properties = create_rbe_exec_properties_dict(
-	parents = ["//third_party/toolchains/rbe_ubuntu2004/config:platform"],
-	exec_properties = create_rbe_exec_properties_dict(
         docker_add_capabilities = "SYS_PTRACE",
         docker_privileged = True,
         # by default, all RBE actions will run on "small" workers.
@@ -47,6 +45,8 @@ platform(
         },
         os_family = "Linux",
     ),
+    # Inherit from the platform target generated by 'rbe_configs_gen'.
+    parents = ["//third_party/toolchains/rbe_ubuntu2004/config:platform"],
 )
 
 # The default toolchain suite for RBE windows, pass it to --crosstool_top
@@ -64,11 +64,14 @@ alias(
 # The default platform for RBE windows
 platform(
     name = "rbe_windows_default_platform",
-    # 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(
-        os_family = "Windows",
         # by default, all RBE actions will run on "small" workers.
-        labels = {"os": "windows_2019", "machine_size": "small"},
+        labels = {
+            "os": "windows_2019",
+            "machine_size": "small",
+        },
+        os_family = "Windows",
     ),
+    # Inherit from the platform target generated by 'rbe_configs_gen'.
+    parents = ["//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/config:platform"],
 )

third_party/toolchains/rbe_ubuntu2004/cc/BUILD

@@ -14,9 +14,9 @@
 
 # This becomes the BUILD file for @local_config_cc// under non-BSD unixes.
 
-load(":cc_toolchain_config.bzl", "cc_toolchain_config")
-load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
 load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
+load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
+load(":cc_toolchain_config.bzl", "cc_toolchain_config")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -56,8 +56,13 @@ filegroup(
 
 filegroup(
     name = "compiler_deps",
-    srcs = glob(["extra_tools/**"], allow_empty = True) + [":builtin_include_directory_paths",
+    srcs = glob(
-    ":cc_wrapper"],
+        ["extra_tools/**"],
+        allow_empty = True,
+    ) + [
+        ":builtin_include_directory_paths",
+        ":cc_wrapper",
+    ],
 )
 
 # This is the entry point for --crosstool_top.  Toolchains are found
@@ -75,42 +80,87 @@ cc_toolchain_suite(
 
 cc_toolchain(
     name = "cc-compiler-k8",
-    toolchain_identifier = "linux_gnu_x86",
-    toolchain_config = ":linux_gnu_x86",
     all_files = ":compiler_deps",
     ar_files = ":compiler_deps",
     as_files = ":compiler_deps",
     compiler_files = ":compiler_deps",
     dwp_files = ":empty",
     linker_files = ":compiler_deps",
+    module_map = ":module.modulemap",
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_header_parsing = 1,
     supports_param_files = 1,
-    module_map = ":module.modulemap",
+    toolchain_config = ":linux_gnu_x86",
+    toolchain_identifier = "linux_gnu_x86",
 )
 
 cc_toolchain_config(
     name = "linux_gnu_x86",
-    cpu = "k8",
+    abi_libc_version = "glibc_2.19",
+    abi_version = "clang",
+    compile_flags = [
+        "-fstack-protector",
+        "-Wall",
+        "-Wthread-safety",
+        "-Wself-assign",
+        "-Wunused-but-set-parameter",
+        "-Wno-free-nonheap-object",
+        "-fcolor-diagnostics",
+        "-fno-omit-frame-pointer",
+    ],
     compiler = "clang",
-    toolchain_identifier = "linux_gnu_x86",
+    conly_flags = [],
+    coverage_compile_flags = ["--coverage"],
+    coverage_link_flags = ["--coverage"],
+    cpu = "k8",
+    cxx_builtin_include_directories = [
+        "/usr/local/lib/clang/19/include",
+        "/usr/local/include",
+        "/usr/include/x86_64-linux-gnu",
+        "/usr/include",
+        "/usr/local/lib/clang/19/share",
+        "/usr/include/c++/9",
+        "/usr/include/x86_64-linux-gnu/c++/9",
+        "/usr/include/c++/9/backward",
+        "/usr/local/include/c++/v1",
+        "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
+    ],
+    cxx_flags = ["-std=c++14"],
+    dbg_compile_flags = ["-g"],
+    extra_flags_per_feature = {"use_module_maps": [
+        "-Xclang",
+        "-fno-cxx-modules",
+    ]},
     host_system_name = "i686-unknown-linux-gnu",
-    target_system_name = "x86_64-unknown-linux-gnu",
+    link_flags = [
+        "-fuse-ld=/usr/local/bin/ld.lld",
+        "-B/usr/local/bin",
+        "-Wl,-no-as-needed",
+        "-Wl,-z,relro,-z,now",
+    ],
+    link_libs = [
+        "-Wl,--push-state,-as-needed",
+        "-lstdc++",
+        "-Wl,--pop-state",
+        "-Wl,--push-state,-as-needed",
+        "-lm",
+        "-Wl,--pop-state",
+    ],
+    opt_compile_flags = [
+        "-g0",
+        "-O2",
+        "-D_FORTIFY_SOURCE=1",
+        "-DNDEBUG",
+        "-ffunction-sections",
+        "-fdata-sections",
+    ],
+    opt_link_flags = ["-Wl,--gc-sections"],
+    supports_start_end_lib = True,
     target_libc = "glibc_2.19",
-    abi_version = "clang",
+    target_system_name = "x86_64-unknown-linux-gnu",
-    abi_libc_version = "glibc_2.19",
+    tool_paths = {
-    cxx_builtin_include_directories = ["/usr/local/lib/clang/19/include",
+        "ar": "/usr/bin/ar",
-    "/usr/local/include",
-    "/usr/include/x86_64-linux-gnu",
-    "/usr/include",
-    "/usr/local/lib/clang/19/share",
-    "/usr/include/c++/9",
-    "/usr/include/x86_64-linux-gnu/c++/9",
-    "/usr/include/c++/9/backward",
-    "/usr/local/include/c++/v1",
-    "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"],
-    tool_paths = {"ar": "/usr/bin/ar",
         "ld": "/usr/bin/ld",
         "llvm-cov": "/usr/local/bin/llvm-cov",
         "llvm-profdata": "/usr/local/bin/llvm-profdata",
@@ -122,51 +172,21 @@ cc_toolchain_config(
         "objcopy": "/usr/bin/objcopy",
         "objdump": "/usr/bin/objdump",
         "strip": "/usr/bin/strip",
-        "parse_headers": "cc_wrapper.sh"},
+        "parse_headers": "cc_wrapper.sh",
-    compile_flags = ["-fstack-protector",
+    },
-    "-Wall",
+    toolchain_identifier = "linux_gnu_x86",
-    "-Wthread-safety",
+    unfiltered_compile_flags = [
-    "-Wself-assign",
+        "-no-canonical-prefixes",
-    "-Wunused-but-set-parameter",
+        "-Wno-builtin-macro-redefined",
-    "-Wno-free-nonheap-object",
+        "-D__DATE__=\"redacted\"",
-    "-fcolor-diagnostics",
+        "-D__TIMESTAMP__=\"redacted\"",
-    "-fno-omit-frame-pointer"],
+        "-D__TIME__=\"redacted\"",
-    opt_compile_flags = ["-g0",
+    ],
-    "-O2",
-    "-D_FORTIFY_SOURCE=1",
-    "-DNDEBUG",
-    "-ffunction-sections",
-    "-fdata-sections"],
-    dbg_compile_flags = ["-g"],
-    conly_flags = [],
-    cxx_flags = ["-std=c++14"],
-    link_flags = ["-fuse-ld=/usr/local/bin/ld.lld",
-    "-B/usr/local/bin",
-    "-Wl,-no-as-needed",
-    "-Wl,-z,relro,-z,now"],
-    link_libs = ["-Wl,--push-state,-as-needed",
-    "-lstdc++",
-    "-Wl,--pop-state",
-    "-Wl,--push-state,-as-needed",
-    "-lm",
-    "-Wl,--pop-state"],
-    opt_link_flags = ["-Wl,--gc-sections"],
-    unfiltered_compile_flags = ["-no-canonical-prefixes",
-    "-Wno-builtin-macro-redefined",
-    "-D__DATE__=\"redacted\"",
-    "-D__TIMESTAMP__=\"redacted\"",
-    "-D__TIME__=\"redacted\""],
-    coverage_compile_flags = ["--coverage"],
-    coverage_link_flags = ["--coverage"],
-    supports_start_end_lib = True,
-    extra_flags_per_feature = {"use_module_maps": ["-Xclang", "-fno-cxx-modules"]},
 )
 
 # Android tooling requires a default toolchain for the armeabi-v7a cpu.
 cc_toolchain(
     name = "cc-compiler-armeabi-v7a",
-    toolchain_identifier = "stub_armeabi-v7a",
-    toolchain_config = ":stub_armeabi-v7a",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":empty",
@@ -176,6 +196,8 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":stub_armeabi-v7a",
+    toolchain_identifier = "stub_armeabi-v7a",
 )
 
 armeabi_cc_toolchain_config(name = "stub_armeabi-v7a")

third_party/toolchains/rbe_ubuntu2004/config/BUILD

@@ -17,7 +17,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-
 toolchain(
     name = "cc-toolchain",
     exec_compatible_with = [
@@ -35,7 +34,6 @@ toolchain(
 
 platform(
     name = "platform",
-    parents = ["@local_config_platform//:host"],
     constraint_values = [
         "@platforms//os:linux",
         "@platforms//cpu:x86_64",
@@ -45,4 +43,5 @@ platform(
         "container-image": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:b3eb1a17b7b091e3c5648a803076b2c40601242ff91c04d55997af6641305f68",
         "OSFamily": "Linux",
     },
+    parents = ["@local_config_platform//:host"],
 )

third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/cc/BUILD

@@ -14,9 +14,9 @@
 
 # This becomes the BUILD file for @local_config_cc// under Windows.
 
-load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite", "cc_library")
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_toolchain", "cc_toolchain_suite")
-load(":windows_cc_toolchain_config.bzl", "cc_toolchain_config")
 load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
+load(":windows_cc_toolchain_config.bzl", "cc_toolchain_config")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -31,17 +31,17 @@ filegroup(
 
 filegroup(
     name = "mingw_compiler_files",
-    srcs = [":builtin_include_directory_paths_mingw"]
+    srcs = [":builtin_include_directory_paths_mingw"],
 )
 
 filegroup(
     name = "clangcl_compiler_files",
-    srcs = [":builtin_include_directory_paths_clangcl"]
+    srcs = [":builtin_include_directory_paths_clangcl"],
 )
 
 filegroup(
     name = "msvc_compiler_files",
-    srcs = [":builtin_include_directory_paths_msvc"]
+    srcs = [":builtin_include_directory_paths_msvc"],
 )
 
 # Hardcoded toolchain, legacy behaviour.
@@ -71,8 +71,6 @@ cc_toolchain_suite(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows_msys",
-    toolchain_identifier = "msys_x64",
-    toolchain_config = ":msys_x64",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":mingw_compiler_files",
@@ -82,20 +80,27 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":msys_x64",
+    toolchain_identifier = "msys_x64",
 )
 
 cc_toolchain_config(
     name = "msys_x64",
-    cpu = "x64_windows",
+    abi_libc_version = "local",
+    abi_version = "local",
     compiler = "msys-gcc",
+    cpu = "x64_windows",
+    cxx_builtin_include_directories = [
+        "c:/msys64/usr/",
+    ],
+    dbg_mode_debug_flag = "/DEBUG:FULL",
+    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
     host_system_name = "local",
-    target_system_name = "local",
     target_libc = "msys",
-    abi_version = "local",
+    target_system_name = "local",
-    abi_libc_version = "local",
+    tool_bin_path = "c:/msys64/usr/bin",
-    cxx_builtin_include_directories = [        "c:/msys64/usr/",
+    tool_paths = {
-        ],
+        "ar": "c:/msys64/usr/bin/ar",
-    tool_paths = {"ar": "c:/msys64/usr/bin/ar",
         "cpp": "c:/msys64/usr/bin/cpp",
         "dwp": "c:/msys64/usr/bin/dwp",
         "gcc": "c:/msys64/usr/bin/gcc",
@@ -104,10 +109,8 @@ cc_toolchain_config(
         "nm": "c:/msys64/usr/bin/nm",
         "objcopy": "c:/msys64/usr/bin/objcopy",
         "objdump": "c:/msys64/usr/bin/objdump",
-        "strip": "c:/msys64/usr/bin/strip"},
+        "strip": "c:/msys64/usr/bin/strip",
-    tool_bin_path = "c:/msys64/usr/bin",
+    },
-    dbg_mode_debug_flag = "/DEBUG:FULL",
-    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
 )
 
 toolchain(
@@ -127,8 +130,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows_mingw",
-    toolchain_identifier = "msys_x64_mingw",
-    toolchain_config = ":msys_x64_mingw",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":mingw_compiler_files",
@@ -138,21 +139,27 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 0,
+    toolchain_config = ":msys_x64_mingw",
+    toolchain_identifier = "msys_x64_mingw",
 )
 
 cc_toolchain_config(
     name = "msys_x64_mingw",
-    cpu = "x64_windows",
+    abi_libc_version = "local",
+    abi_version = "local",
     compiler = "mingw-gcc",
+    cpu = "x64_windows",
+    cxx_builtin_include_directories = [
+        "c:/msys64/mingw64/",
+    ],
+    dbg_mode_debug_flag = "/DEBUG:FULL",
+    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
     host_system_name = "local",
-    target_system_name = "local",
     target_libc = "mingw",
-    abi_version = "local",
+    target_system_name = "local",
-    abi_libc_version = "local",
     tool_bin_path = "c:/msys64/mingw64/bin",
-    cxx_builtin_include_directories = [        "c:/msys64/mingw64/",
+    tool_paths = {
-        ],
+        "ar": "c:/msys64/mingw64/bin/ar",
-    tool_paths = {"ar": "c:/msys64/mingw64/bin/ar",
         "cpp": "c:/msys64/mingw64/bin/cpp",
         "dwp": "c:/msys64/mingw64/bin/dwp",
         "gcc": "c:/msys64/mingw64/bin/gcc",
@@ -161,9 +168,8 @@ cc_toolchain_config(
         "nm": "c:/msys64/mingw64/bin/nm",
         "objcopy": "c:/msys64/mingw64/bin/objcopy",
         "objdump": "c:/msys64/mingw64/bin/objdump",
-        "strip": "c:/msys64/mingw64/bin/strip"},
+        "strip": "c:/msys64/mingw64/bin/strip",
-    dbg_mode_debug_flag = "/DEBUG:FULL",
+    },
-    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
 )
 
 toolchain(
@@ -183,8 +189,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows",
-    toolchain_identifier = "msvc_x64",
-    toolchain_config = ":msvc_x64",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":msvc_compiler_files",
@@ -194,32 +198,39 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":msvc_x64",
+    toolchain_identifier = "msvc_x64",
 )
 
 cc_toolchain_config(
     name = "msvc_x64",
-    cpu = "x64_windows",
-    compiler = "msvc-cl",
-    host_system_name = "local",
-    target_system_name = "local",
-    target_libc = "msvcrt",
-    abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "msvc_x64",
+    abi_version = "local",
-    msvc_env_tmp = "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp",
+    archiver_flags = ["/MACHINE:X64"],
-    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\VS\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32",
+    compiler = "msvc-cl",
-    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
+    cpu = "x64_windows",
-    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\um\\x64",
+    cxx_builtin_include_directories = [
-    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
+        "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include",
-    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/ml64.exe",
-    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/link.exe",
-    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/lib.exe",
-    cxx_builtin_include_directories = [        "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt"],
+        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
+    ],
+    dbg_mode_debug_flag = "/DEBUG:FULL",
+    default_link_flags = ["/MACHINE:X64"],
+    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
+    host_system_name = "local",
+    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
+    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
+    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\um\\x64",
+    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\VS\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32",
+    msvc_env_tmp = "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp",
+    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/lib.exe",
+    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/link.exe",
+    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/ml64.exe",
+    target_libc = "msvcrt",
+    target_system_name = "local",
     tool_paths = {
         "ar": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/lib.exe",
         "ml": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/ml64.exe",
@@ -232,10 +243,7 @@ cc_toolchain_config(
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
     },
-    archiver_flags = ["/MACHINE:X64"],
+    toolchain_identifier = "msvc_x64",
-    default_link_flags = ["/MACHINE:X64"],
-    dbg_mode_debug_flag = "/DEBUG:FULL",
-    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
 )
 
 toolchain(
@@ -254,8 +262,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_x86_windows",
-    toolchain_identifier = "msvc_x64_x86",
-    toolchain_config = ":msvc_x64_x86",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":msvc_compiler_files",
@@ -265,32 +271,39 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":msvc_x64_x86",
+    toolchain_identifier = "msvc_x64_x86",
 )
 
 cc_toolchain_config(
     name = "msvc_x64_x86",
-    cpu = "x64_windows",
-    compiler = "msvc-cl",
-    host_system_name = "local",
-    target_system_name = "local",
-    target_libc = "msvcrt",
-    abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "msvc_x64_x86",
+    abi_version = "local",
-    msvc_env_tmp = "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp",
+    archiver_flags = ["/MACHINE:X86"],
-    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x86;C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\VS\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32",
+    compiler = "msvc-cl",
-    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
+    cpu = "x64_windows",
-    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\um\\x86",
+    cxx_builtin_include_directories = [
-    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/cl.exe",
+        "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include",
-    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/ml.exe",
-    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/link.exe",
-    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/lib.exe",
-    cxx_builtin_include_directories = [        "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt"],
+        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
+    ],
+    dbg_mode_debug_flag = "/DEBUG:FULL",
+    default_link_flags = ["/MACHINE:X86"],
+    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
+    host_system_name = "local",
+    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/cl.exe",
+    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
+    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\um\\x86",
+    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x86;C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\VS\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32",
+    msvc_env_tmp = "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp",
+    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/lib.exe",
+    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/link.exe",
+    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/ml.exe",
+    target_libc = "msvcrt",
+    target_system_name = "local",
     tool_paths = {
         "ar": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/lib.exe",
         "ml": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/ml.exe",
@@ -303,10 +316,7 @@ cc_toolchain_config(
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
     },
-    archiver_flags = ["/MACHINE:X86"],
+    toolchain_identifier = "msvc_x64_x86",
-    default_link_flags = ["/MACHINE:X86"],
-    dbg_mode_debug_flag = "/DEBUG:FULL",
-    fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
 )
 
 toolchain(
@@ -325,8 +335,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_arm_windows",
-    toolchain_identifier = "msvc_x64_arm",
-    toolchain_config = ":msvc_x64_arm",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":msvc_compiler_files",
@@ -336,27 +344,32 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":msvc_x64_arm",
+    toolchain_identifier = "msvc_x64_arm",
 )
 
 cc_toolchain_config(
     name = "msvc_x64_arm",
-    cpu = "x64_windows",
+    abi_libc_version = "local",
+    abi_version = "local",
+    archiver_flags = ["/MACHINE:ARM"],
     compiler = "msvc-cl",
+    cpu = "x64_windows",
+    cxx_builtin_include_directories = [],
+    dbg_mode_debug_flag = "/DEBUG",
+    default_link_flags = ["/MACHINE:ARM"],
+    fastbuild_mode_debug_flag = "/DEBUG",
     host_system_name = "local",
-    target_system_name = "local",
+    msvc_cl_path = "vc_installation_error_arm.bat",
-    target_libc = "msvcrt",
-    abi_version = "local",
-    abi_libc_version = "local",
-    toolchain_identifier = "msvc_x64_arm",
-    msvc_env_tmp = "msvc_not_found",
-    msvc_env_path = "msvc_not_found",
     msvc_env_include = "msvc_not_found",
     msvc_env_lib = "msvc_not_found",
-    msvc_cl_path = "vc_installation_error_arm.bat",
+    msvc_env_path = "msvc_not_found",
-    msvc_ml_path = "vc_installation_error_arm.bat",
+    msvc_env_tmp = "msvc_not_found",
-    msvc_link_path = "vc_installation_error_arm.bat",
     msvc_lib_path = "vc_installation_error_arm.bat",
-    cxx_builtin_include_directories = [],
+    msvc_link_path = "vc_installation_error_arm.bat",
+    msvc_ml_path = "vc_installation_error_arm.bat",
+    target_libc = "msvcrt",
+    target_system_name = "local",
     tool_paths = {
         "ar": "vc_installation_error_arm.bat",
         "ml": "vc_installation_error_arm.bat",
@@ -369,10 +382,7 @@ cc_toolchain_config(
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
     },
-    archiver_flags = ["/MACHINE:ARM"],
+    toolchain_identifier = "msvc_x64_arm",
-    default_link_flags = ["/MACHINE:ARM"],
-    dbg_mode_debug_flag = "/DEBUG",
-    fastbuild_mode_debug_flag = "/DEBUG",
 )
 
 toolchain(
@@ -391,8 +401,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-arm64_windows",
-    toolchain_identifier = "msvc_arm64",
-    toolchain_config = ":msvc_arm64",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":msvc_compiler_files",
@@ -402,27 +410,32 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":msvc_arm64",
+    toolchain_identifier = "msvc_arm64",
 )
 
 cc_toolchain_config(
     name = "msvc_arm64",
-    cpu = "x64_windows",
+    abi_libc_version = "local",
+    abi_version = "local",
+    archiver_flags = ["/MACHINE:ARM64"],
     compiler = "msvc-cl",
+    cpu = "x64_windows",
+    cxx_builtin_include_directories = [],
+    dbg_mode_debug_flag = "/DEBUG",
+    default_link_flags = ["/MACHINE:ARM64"],
+    fastbuild_mode_debug_flag = "/DEBUG",
     host_system_name = "local",
-    target_system_name = "local",
+    msvc_cl_path = "vc_installation_error_arm64.bat",
-    target_libc = "msvcrt",
-    abi_version = "local",
-    abi_libc_version = "local",
-    toolchain_identifier = "msvc_arm64",
-    msvc_env_tmp = "msvc_not_found",
-    msvc_env_path = "msvc_not_found",
     msvc_env_include = "msvc_not_found",
     msvc_env_lib = "msvc_not_found",
-    msvc_cl_path = "vc_installation_error_arm64.bat",
+    msvc_env_path = "msvc_not_found",
-    msvc_ml_path = "vc_installation_error_arm64.bat",
+    msvc_env_tmp = "msvc_not_found",
-    msvc_link_path = "vc_installation_error_arm64.bat",
     msvc_lib_path = "vc_installation_error_arm64.bat",
-    cxx_builtin_include_directories = [],
+    msvc_link_path = "vc_installation_error_arm64.bat",
+    msvc_ml_path = "vc_installation_error_arm64.bat",
+    target_libc = "msvcrt",
+    target_system_name = "local",
     tool_paths = {
         "ar": "vc_installation_error_arm64.bat",
         "ml": "vc_installation_error_arm64.bat",
@@ -435,10 +448,7 @@ cc_toolchain_config(
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
     },
-    archiver_flags = ["/MACHINE:ARM64"],
+    toolchain_identifier = "msvc_arm64",
-    default_link_flags = ["/MACHINE:ARM64"],
-    dbg_mode_debug_flag = "/DEBUG",
-    fastbuild_mode_debug_flag = "/DEBUG",
 )
 
 toolchain(
@@ -454,11 +464,8 @@ toolchain(
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
 
-
 cc_toolchain(
     name = "cc-compiler-x64_windows-clang-cl",
-    toolchain_identifier = "clang_cl_x64",
-    toolchain_config = ":clang_cl_x64",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":clangcl_compiler_files",
@@ -468,27 +475,35 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":clang_cl_x64",
+    toolchain_identifier = "clang_cl_x64",
 )
 
 cc_toolchain_config(
     name = "clang_cl_x64",
-    cpu = "x64_windows",
+    abi_libc_version = "local",
+    abi_version = "local",
+    archiver_flags = ["/MACHINE:X64"],
     compiler = "clang-cl",
+    cpu = "x64_windows",
+    cxx_builtin_include_directories = [],
+    dbg_mode_debug_flag = "/DEBUG",
+    default_link_flags = [
+        "/MACHINE:X64",
+        "/DEFAULTLIB:clang_rt.builtins-x86_64.lib",
+    ],
+    fastbuild_mode_debug_flag = "/DEBUG",
     host_system_name = "local",
-    target_system_name = "local",
+    msvc_cl_path = "clang_installation_error.bat",
-    target_libc = "msvcrt",
-    abi_version = "local",
-    abi_libc_version = "local",
-    toolchain_identifier = "clang_cl_x64",
-    msvc_env_tmp = "clang_cl_not_found",
-    msvc_env_path = "clang_cl_not_found",
     msvc_env_include = "clang_cl_not_found",
     msvc_env_lib = "clang_cl_not_found",
-    msvc_cl_path = "clang_installation_error.bat",
+    msvc_env_path = "clang_cl_not_found",
-    msvc_ml_path = "clang_installation_error.bat",
+    msvc_env_tmp = "clang_cl_not_found",
-    msvc_link_path = "clang_installation_error.bat",
     msvc_lib_path = "clang_installation_error.bat",
-    cxx_builtin_include_directories = [],
+    msvc_link_path = "clang_installation_error.bat",
+    msvc_ml_path = "clang_installation_error.bat",
+    target_libc = "msvcrt",
+    target_system_name = "local",
     tool_paths = {
         "ar": "clang_installation_error.bat",
         "ml": "clang_installation_error.bat",
@@ -501,10 +516,7 @@ cc_toolchain_config(
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
     },
-    archiver_flags = ["/MACHINE:X64"],
+    toolchain_identifier = "clang_cl_x64",
-    default_link_flags = ["/MACHINE:X64", "/DEFAULTLIB:clang_rt.builtins-x86_64.lib"],
-    dbg_mode_debug_flag = "/DEBUG",
-    fastbuild_mode_debug_flag = "/DEBUG",
 )
 
 toolchain(
@@ -524,8 +536,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-arm64_windows-clang-cl",
-    toolchain_identifier = "clang_cl_arm64",
-    toolchain_config = ":clang_cl_arm64",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":clangcl_compiler_files",
@@ -535,27 +545,32 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":clang_cl_arm64",
+    toolchain_identifier = "clang_cl_arm64",
 )
 
 cc_toolchain_config(
     name = "clang_cl_arm64",
-    cpu = "arm64_windows",
+    abi_libc_version = "local",
+    abi_version = "local",
+    archiver_flags = ["/MACHINE:ARM64"],
     compiler = "clang-cl",
+    cpu = "arm64_windows",
+    cxx_builtin_include_directories = [],
+    dbg_mode_debug_flag = "/DEBUG",
+    default_link_flags = ["/MACHINE:ARM64"],
+    fastbuild_mode_debug_flag = "/DEBUG",
     host_system_name = "local",
-    target_system_name = "aarch64-pc-windows-msvc",
+    msvc_cl_path = "vc_installation_error_arm64.bat",
-    target_libc = "msvcrt",
-    abi_version = "local",
-    abi_libc_version = "local",
-    toolchain_identifier = "clang_cl_arm64",
-    msvc_env_tmp = "clang_cl_not_found",
-    msvc_env_path = "clang_cl_not_found",
     msvc_env_include = "clang_cl_not_found",
     msvc_env_lib = "clang_cl_not_found",
-    msvc_cl_path = "vc_installation_error_arm64.bat",
+    msvc_env_path = "clang_cl_not_found",
-    msvc_ml_path = "vc_installation_error_arm64.bat",
+    msvc_env_tmp = "clang_cl_not_found",
-    msvc_link_path = "vc_installation_error_arm64.bat",
     msvc_lib_path = "vc_installation_error_arm64.bat",
-    cxx_builtin_include_directories = [],
+    msvc_link_path = "vc_installation_error_arm64.bat",
+    msvc_ml_path = "vc_installation_error_arm64.bat",
+    target_libc = "msvcrt",
+    target_system_name = "aarch64-pc-windows-msvc",
     tool_paths = {
         "ar": "vc_installation_error_arm64.bat",
         "ml": "vc_installation_error_arm64.bat",
@@ -568,10 +583,7 @@ cc_toolchain_config(
         "objdump": "wrapper/bin/msvc_nop.bat",
         "strip": "wrapper/bin/msvc_nop.bat",
     },
-    archiver_flags = ["/MACHINE:ARM64"],
+    toolchain_identifier = "clang_cl_arm64",
-    default_link_flags = ["/MACHINE:ARM64"],
-    dbg_mode_debug_flag = "/DEBUG",
-    fastbuild_mode_debug_flag = "/DEBUG",
 )
 
 toolchain(
@@ -590,8 +602,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-armeabi-v7a",
-    toolchain_identifier = "stub_armeabi-v7a",
-    toolchain_config = ":stub_armeabi-v7a",
     all_files = ":empty",
     ar_files = ":empty",
     as_files = ":empty",
@@ -601,6 +611,8 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    toolchain_config = ":stub_armeabi-v7a",
+    toolchain_identifier = "stub_armeabi-v7a",
 )
 
 armeabi_cc_toolchain_config(name = "stub_armeabi-v7a")

third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/config/BUILD

@@ -17,7 +17,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-
 toolchain(
     name = "cc-toolchain",
     exec_compatible_with = [
@@ -34,7 +33,6 @@ toolchain(
 
 platform(
     name = "platform",
-    parents = ["@local_config_platform//:host"],
     constraint_values = [
         "@platforms//os:windows",
         "@platforms//cpu:x86_64",
@@ -43,4 +41,5 @@ platform(
         "container-image": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_windows2019@sha256:63aed074a2ca1bf5af45bb43b255d21d51882d7169ec57be7f0f5454ea5d2c98",
         "OSFamily": "Windows",
     },
+    parents = ["@local_config_platform//:host"],
 )

third_party/upb/upb/BUILD

@@ -6,7 +6,6 @@
 # https://developers.google.com/open-source/licenses/bsd
 
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
-load("@rules_python//python:defs.bzl", "py_binary")
 load("//bazel/private:upb_proto_library_internal/copts.bzl", "upb_proto_library_copts")
 load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
 

third_party/upb/upb/bazel/BUILD

@@ -5,7 +5,6 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
-load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@rules_python//python:defs.bzl", "py_binary")
 
 # begin:google_only

third_party/upb/upb/cmake/BUILD.bazel

@@ -5,6 +5,7 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
+load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 load(
     "//upb/bazel:build_defs.bzl",
     "make_shell_script",

tools/distrib/python/grpcio_tools/BUILD.bazel

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_library")
 load("//bazel:cython_library.bzl", "pyx_library")
 load("grpcio_tools.bzl", "internal_copied_filegroup")
 

tools/distrib/python/grpcio_tools/grpc_tools/test/BUILD.bazel

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_test")
 load("//bazel:python_rules.bzl", "py_proto_library")
 
 package(default_testonly = 1)

tools/distrib/python/xds_protos/BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_python//python:defs.bzl", "py_library")
+
 package(default_visibility = ["//src/python/grpcio_csds:__subpackages__"])
 
 _XDS_PROTO_DIRECTORIES = [