Switch linux RBE to ubuntu18.04, get rid of rbe_autoconfig (#32559)

First step in the modernization of our RBE stack (see
go/rbe-tech-debt-notes).

- Get rid of the deprecated rbe_autoconfig and start using
[rbe_configs_gen](https://github.com/bazelbuild/bazel-toolchains#rbe_configs_gen---cli-tool-to-generate-configs)
+ check in the generated toolchain configs.
- Switch from marketplace.gcr.io/google/rbe-ubuntu16-04 to
marketplace.gcr.io/google/rbe-ubuntu18-04 (this image is still not owned
by us, but at least it's newer and demonstrates how a switch to a newer
docker image is done).
- provide script for generating the linux RBE toolchain configs.
- cleanup RBE configuration in the bazelrc files used for remote build

WORKSPACE

@@ -24,26 +24,6 @@ custom_exec_properties(
     },
 )
 
-load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
-
-# Create toolchain configuration for remote execution.
-rbe_autoconfig(
-    name = "rbe_default",
-    exec_properties = create_rbe_exec_properties_dict(
-        docker_add_capabilities = "SYS_PTRACE",
-        docker_privileged = True,
-        labels = {
-            "os": "ubuntu",
-            "machine_size": "small",
-        },
-        os_family = "Linux",
-    ),
-    # use exec_properties instead of deprecated remote_execution_properties
-    use_legacy_platform_definition = False,
-)
-
-load("@bazel_toolchains//rules:environments.bzl", "clang_env")
-load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
@@ -71,17 +51,6 @@ local_repository(
     path = "./src/core/ext/transport/binder/java",
 )
 
-# Create msan toolchain configuration for remote execution.
-rbe_autoconfig(
-    name = "rbe_msan",
-    env = dicts.add(
-        clang_env(),
-        {
-            "BAZEL_LINKOPTS": "-lc++:-lc++abi:-lm",
-        },
-    ),
-)
-
 load("@io_bazel_rules_python//python:pip.bzl", "pip_install")
 
 pip_install(

include/grpc/support/port_platform.h

@@ -776,12 +776,12 @@ extern void gpr_unreachable_code(const char* reason, const char* file,
 
 #define GRPC_CALLBACK_API_NONEXPERIMENTAL
 
-/* clang 11 with msan miscompiles destruction of [[no_unique_address]] members
+/* clang 12 and lower with msan miscompiles destruction of [[no_unique_address]]
- * of zero size - for a repro see:
+ * members of zero size - for a repro see:
  * test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
  */
 #ifdef __clang__
-#if __clang__ && __clang_major__ <= 11 && __has_feature(memory_sanitizer)
+#if __clang__ && __clang_major__ <= 12 && __has_feature(memory_sanitizer)
 #undef GPR_NO_UNIQUE_ADDRESS
 #define GPR_NO_UNIQUE_ADDRESS
 #endif

test/distrib/bazel/test_single_bazel_version.sh

@@ -36,6 +36,7 @@ EXCLUDED_TARGETS=(
   # This appears to be a legitimately broken BUILD file. There's a reference to
   # a non-existent "link_dynamic_library.sh".
   "-//third_party/toolchains/rbe_windows_bazel_5.2.0_vs2019:all"
+  "-//third_party/toolchains:rbe_windows_default_toolchain_suite"
 
   # TODO(jtattermusch): add back once fixed
   "-//examples/android/binder/..."

third_party/toolchains/BUILD

@@ -18,14 +18,52 @@ 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_windows",
+    name = "rbe_linux_default_toolchain_suite",
-    actual = ":rbe_windows_2019",
+    actual = "//third_party/toolchains/rbe_ubuntu1804/cc:toolchain",
 )
 
-# RBE Windows
+# The default CC toolchain suite for RBE linux
+alias(
+    name = "rbe_linux_default_cc_toolchain",
+    actual = "//third_party/toolchains/rbe_ubuntu1804/config:cc-toolchain",
+)
+
+# The default platform for RBE Linux
+platform(
+	name = "rbe_linux_default_platform",
+    # Inherit from the platform target generated by 'rbe_configs_gen'.
+	parents = ["//third_party/toolchains/rbe_ubuntu1804/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.
+        # For individual targets, this can be overridden by adding the "exec_properties = LARGE_MACHINE"
+        # attribute.
+        labels = {
+            "os": "ubuntu",
+            "machine_size": "small",
+        },
+        os_family = "Linux",
+    ),
+)
+
+# 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_5.2.0_vs2019:toolchain",
+)
+
+# The default CC toolchain suite for RBE windows
+alias(
+    name = "rbe_windows_default_cc_toolchain",
+    actual = "//third_party/toolchains/rbe_windows_bazel_5.2.0_vs2019:cc-toolchain-x64_windows",
+)
+
+# The default platform for RBE windows
 platform(
-    name = "rbe_windows_2019",
+    name = "rbe_windows_default_platform",
     constraint_values = [
         "@platforms//cpu:x86_64",
         "@platforms//os:windows",
@@ -34,6 +72,7 @@ platform(
         # 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"},
     ),
 )

third_party/toolchains/README.md

@@ -1,4 +1,7 @@
-# Windows RBE toolchain configuration
+# RBE toolchain configuration (Linux and Windows)
+
+- rbe_ubuntu1804: Autogenerated toolchain configuration for linux RBE.
+  Run `generate_linux_rbe_configs.sh` to regenerate.
 
 - rbe_windows_bazel_5.2.0_vs2019: The autogenerated toolchain configuration for windows RBE.
   Note that the bazel version denotes the bazel version that was used to generate the toolchain configuration. The configuration

third_party/toolchains/generate_linux_rbe_configs.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# Copyright 2023 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# Generate linux RBE configs using rbe_configs_gen.
+# See https://github.com/bazelbuild/bazel-toolchains#rbe_configs_gen---cli-tool-to-generate-configs
+
+set -ex
+
+cd $(dirname $0)/../..
+
+REPO_ROOT="$(pwd)"
+
+TEMP_DIR="$(mktemp -d)"
+pushd "${TEMP_DIR}"
+# Build the "rbe_configs_gen" binary using the official instructions.
+git clone https://github.com/bazelbuild/bazel-toolchains.git
+cd bazel-toolchains
+# Build "rbe_configs_gen" binary under docker and put it to the current directory.
+docker run --rm -v $PWD:/srcdir -w /srcdir golang:1.16 go build -o rbe_configs_gen ./cmd/rbe_configs_gen/rbe_configs_gen.go
+popd
+
+# location of the "rbe_config_gen" binary as build by the previous step.
+RBE_CONFIGS_GEN_TOOL_PATH="${TEMP_DIR}/bazel-toolchains/rbe_configs_gen"
+
+# the container under which RBE actions will run
+LINUX_RBE_DOCKER_IMAGE=l.gcr.io/google/rbe-ubuntu18-04@sha256:48b67b41118dbcdfc265e7335f454fbefa62681ab8d47200971fc7a52fb32054
+
+# Bazel version used for configuring
+# Needs to be one of the versions from bazel/supported_versions.txt chosen so that the result is compatible
+# with other supported bazel versions.
+BAZEL_VERSION=5.4.0
+
+# TODO(jtattermusch): experiment with --cpp_env_json to simplify bazel build configuration.
+
+# Where to store the generated configs (relative to repo root)
+CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_ubuntu1804
+
+# Delete old generated configs.
+rm -rf "${REPO_ROOT}/${CONFIG_OUTPUT_PATH}"
+
+${RBE_CONFIGS_GEN_TOOL_PATH} \
+    --bazel_version="${BAZEL_VERSION}" \
+    --toolchain_container="${LINUX_RBE_DOCKER_IMAGE}" \
+    --output_src_root="${REPO_ROOT}" \
+    --output_config_path="${CONFIG_OUTPUT_PATH}" \
+    --exec_os=linux \
+    --target_os=linux \
+    --generate_java_configs=false

third_party/toolchains/rbe_ubuntu1804/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 Google LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.

third_party/toolchains/rbe_ubuntu1804/cc/BUILD

@@ -0,0 +1,150 @@
+# Copyright 2016 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# 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")
+
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+cc_library(
+    name = "malloc",
+)
+
+filegroup(
+    name = "empty",
+    srcs = [],
+)
+
+filegroup(
+    name = "cc_wrapper",
+    srcs = ["cc_wrapper.sh"],
+)
+
+filegroup(
+    name = "compiler_deps",
+    srcs = glob(["extra_tools/**"], allow_empty = True) + [":builtin_include_directory_paths"],
+)
+
+# This is the entry point for --crosstool_top.  Toolchains are found
+# by lopping off the name of --crosstool_top and searching for
+# the "${CPU}" entry in the toolchains attribute.
+cc_toolchain_suite(
+    name = "toolchain",
+    toolchains = {
+        "k8|clang": ":cc-compiler-k8",
+        "k8": ":cc-compiler-k8",
+        "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
+        "armeabi-v7a": ":cc-compiler-armeabi-v7a",
+    },
+)
+
+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",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    supports_param_files = 1,
+    module_map = ":module.modulemap",
+)
+
+cc_toolchain_config(
+    name = "linux_gnu_x86",
+    cpu = "k8",
+    compiler = "clang",
+    toolchain_identifier = "linux_gnu_x86",
+    host_system_name = "i686-unknown-linux-gnu",
+    target_system_name = "x86_64-unknown-linux-gnu",
+    target_libc = "glibc_2.19",
+    abi_version = "clang",
+    abi_libc_version = "glibc_2.19",
+    cxx_builtin_include_directories = ["/usr/local/include",
+    "/usr/local/lib/clang/12.0.0/include",
+    "/usr/include/x86_64-linux-gnu",
+    "/usr/include",
+    "/usr/local/lib/clang/12.0.0/share",
+    "/usr/include/c++/7.5.0",
+    "/usr/include/x86_64-linux-gnu/c++/7.5.0",
+    "/usr/include/c++/7.5.0/backward",
+    "/usr/local/include/c++/v1"],
+    tool_paths = {"ar": "/usr/bin/ar",
+        "ld": "/usr/bin/ld",
+        "llvm-cov": "/usr/local/bin/llvm-cov",
+        "cpp": "/usr/bin/cpp",
+        "gcc": "/usr/local/bin/clang-12",
+        "dwp": "/usr/bin/dwp",
+        "gcov": "/dev/null",
+        "nm": "/usr/bin/nm",
+        "objcopy": "/usr/bin/objcopy",
+        "objdump": "/usr/bin/objdump",
+        "strip": "/usr/bin/strip"},
+    compile_flags = ["-fstack-protector",
+    "-Wall",
+    "-Wthread-safety",
+    "-Wself-assign",
+    "-fcolor-diagnostics",
+    "-fno-omit-frame-pointer"],
+    opt_compile_flags = ["-g0",
+    "-O2",
+    "-D_FORTIFY_SOURCE=1",
+    "-DNDEBUG",
+    "-ffunction-sections",
+    "-fdata-sections"],
+    dbg_compile_flags = ["-g"],
+    cxx_flags = ["-std=c++0x"],
+    link_flags = ["-fuse-ld=/usr/bin/ld.gold",
+    "-Wl,-no-as-needed",
+    "-Wl,-z,relro,-z,now",
+    "-B/usr/local/bin"],
+    link_libs = ["-lstdc++",
+    "-lm"],
+    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,
+)
+
+# 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",
+    compiler_files = ":empty",
+    dwp_files = ":empty",
+    linker_files = ":empty",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    supports_param_files = 1,
+)
+
+armeabi_cc_toolchain_config(name = "stub_armeabi-v7a")

third_party/toolchains/rbe_ubuntu1804/cc/WORKSPACE

@@ -0,0 +1,2 @@
+# DO NOT EDIT: automatically generated WORKSPACE file for cc_autoconf rule
+workspace(name = "local_config_cc")

third_party/toolchains/rbe_ubuntu1804/cc/armeabi_cc_toolchain_config.bzl

@@ -0,0 +1,82 @@
+# Copyright 2019 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+"""A Starlark cc_toolchain configuration rule"""
+
+load(
+    "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
+    "feature",
+    "tool_path",
+)
+
+def _impl(ctx):
+    toolchain_identifier = "stub_armeabi-v7a"
+    host_system_name = "armeabi-v7a"
+    target_system_name = "armeabi-v7a"
+    target_cpu = "armeabi-v7a"
+    target_libc = "armeabi-v7a"
+    compiler = "compiler"
+    abi_version = "armeabi-v7a"
+    abi_libc_version = "armeabi-v7a"
+    cc_target_os = None
+    builtin_sysroot = None
+    action_configs = []
+
+    supports_pic_feature = feature(name = "supports_pic", enabled = True)
+    supports_dynamic_linker_feature = feature(name = "supports_dynamic_linker", enabled = True)
+    features = [supports_dynamic_linker_feature, supports_pic_feature]
+
+    cxx_builtin_include_directories = []
+    artifact_name_patterns = []
+    make_variables = []
+
+    tool_paths = [
+        tool_path(name = "ar", path = "/bin/false"),
+        tool_path(name = "compat-ld", path = "/bin/false"),
+        tool_path(name = "cpp", path = "/bin/false"),
+        tool_path(name = "dwp", path = "/bin/false"),
+        tool_path(name = "gcc", path = "/bin/false"),
+        tool_path(name = "gcov", path = "/bin/false"),
+        tool_path(name = "ld", path = "/bin/false"),
+        tool_path(name = "nm", path = "/bin/false"),
+        tool_path(name = "objcopy", path = "/bin/false"),
+        tool_path(name = "objdump", path = "/bin/false"),
+        tool_path(name = "strip", path = "/bin/false"),
+    ]
+
+    return cc_common.create_cc_toolchain_config_info(
+        ctx = ctx,
+        features = features,
+        action_configs = action_configs,
+        artifact_name_patterns = artifact_name_patterns,
+        cxx_builtin_include_directories = cxx_builtin_include_directories,
+        toolchain_identifier = toolchain_identifier,
+        host_system_name = host_system_name,
+        target_system_name = target_system_name,
+        target_cpu = target_cpu,
+        target_libc = target_libc,
+        compiler = compiler,
+        abi_version = abi_version,
+        abi_libc_version = abi_libc_version,
+        tool_paths = tool_paths,
+        make_variables = make_variables,
+        builtin_sysroot = builtin_sysroot,
+        cc_target_os = cc_target_os,
+    )
+
+armeabi_cc_toolchain_config = rule(
+    implementation = _impl,
+    attrs = {},
+    provides = [CcToolchainConfigInfo],
+)

third_party/toolchains/rbe_ubuntu1804/cc/builtin_include_directory_paths

@@ -0,0 +1,15 @@
+This file is generated by cc_configure and contains builtin include directories
+that /usr/local/bin/clang-12 reported. This file is a dependency of every compilation action and
+changes to it will be reflected in the action cache key. When some of these
+paths change, Bazel will make sure to rerun the action, even though none of
+declared action inputs or the action commandline changes.
+
+/usr/local/include
+/usr/local/lib/clang/12.0.0/include
+/usr/include/x86_64-linux-gnu
+/usr/include
+/usr/local/lib/clang/12.0.0/share
+/usr/include/c++/7.5.0
+/usr/include/x86_64-linux-gnu/c++/7.5.0
+/usr/include/c++/7.5.0/backward
+/usr/local/include/c++/v1

third_party/toolchains/rbe_ubuntu1804/cc/cc_wrapper.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Copyright 2015 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+# Ship the environment to the C++ action
+#
+set -eu
+
+# Set-up the environment
+
+
+# Call the C++ compiler
+/usr/local/bin/clang-12 "$@"

third_party/toolchains/rbe_ubuntu1804/cc/tools/cpp/empty.cc

@@ -0,0 +1 @@
+int main() {}

third_party/toolchains/rbe_ubuntu1804/config/BUILD

@@ -0,0 +1,48 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# This file is auto-generated by github.com/bazelbuild/bazel-toolchains/pkg/rbeconfigsgen
+# and should not be modified directly.
+
+package(default_visibility = ["//visibility:public"])
+
+
+toolchain(
+    name = "cc-toolchain",
+    exec_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        "@bazel_tools//tools/cpp:clang",
+    ],
+    target_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
+    toolchain = "//third_party/toolchains/rbe_ubuntu1804/cc:cc-compiler-k8",
+    toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
+)
+
+platform(
+    name = "platform",
+    parents = ["@local_config_platform//:host"],
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        "@bazel_tools//tools/cpp:clang",
+    ],
+    exec_properties = {
+        "container-image": "docker://gcr.io/cloud-marketplace/google/rbe-ubuntu18-04@sha256:48b67b41118dbcdfc265e7335f454fbefa62681ab8d47200971fc7a52fb32054",
+        "OSFamily": "Linux",
+    },
+)

tools/remote_build/include/rbe_base_config.bazelrc

@@ -27,6 +27,7 @@ build --remote_instance_name=projects/grpc-testing/instances/default_instance
 # unless overridden by --google_credentials=service_account_credentials.json
 # How to setup credentials to be able to use bazel RBE locally:
 # https://cloud.google.com/remote-build-execution/docs/results-ui/getting-started-results-ui
+# TODO(jtattermusch): Option 'auth_enabled' is deprecated: Use --google_default_credentials instead
 build --auth_enabled=true
 
 # use remote cache (remote execution needs to be configured separately)
@@ -40,4 +41,5 @@ build --remote_cache=grpcs://remotebuildexecution.googleapis.com
 build --bes_backend=grpcs://buildeventservice.googleapis.com
 build --bes_timeout=600s
 build --bes_results_url="https://source.cloud.google.com/results/invocations/"
+# TODO(jtattermusch): Option 'project_id' is deprecated: Use --bes_instance_name instead
 build --project_id=grpc-testing

tools/remote_build/include/rbe_remote_execution.bazelrc

@@ -31,5 +31,7 @@ build --remote_timeout=7200  # very large value to avoid problems like https://g
 build --define GRPC_PORT_ISOLATED_RUNTIME=1
 
 # TODO(jtattermusch): is this still required for remote execution to work?
+# TODO(jtattermusch): Option 'experimental_strict_action_env' is deprecated: Use --incompatible_strict_action_env instead
 build --experimental_strict_action_env=true
+# TODO(jtattermusch): is this still required for remote execution to work?
 build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

tools/remote_build/linux.bazelrc

@@ -18,12 +18,12 @@
 import %workspace%/tools/remote_build/include/rbe_remote_execution.bazelrc
 
 # Next section is linux-specific RBE configuration
-build --crosstool_top=@rbe_default//cc:toolchain
+build --crosstool_top=//third_party/toolchains:rbe_linux_default_toolchain_suite
-build --extra_toolchains=@rbe_default//config:cc-toolchain
+build --extra_toolchains=//third_party/toolchains:rbe_linux_default_cc_toolchain
 # Use custom execution platforms defined in third_party/toolchains
-build --extra_execution_platforms=@rbe_default//config:platform
+build --extra_execution_platforms=//third_party/toolchains:rbe_linux_default_platform
-build --host_platform=@rbe_default//config:platform
+build --host_platform=//third_party/toolchains:rbe_linux_default_platform
-build --platforms=@rbe_default//config:platform
+build --platforms=//third_party/toolchains:rbe_linux_default_platform
 
 # we assume the default bazel RBE build is on linux,
 # so filter out stuff that should not be built or run there.
@@ -53,12 +53,7 @@ build:msan --test_timeout=60,900,1800,3600
 # TODO(jtattermusch): revisit the disabled tests
 build:msan --test_tag_filters=-no_linux,-nomsan,-json_run_localhost
 build:msan --cxxopt=--stdlib=libc++
-# setting LD_LIBRARY_PATH is necessary
+build:msan --linkopt=--stdlib=libc++
-# to avoid "libc++.so.1: cannot open shared object file"
-build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib
-build:msan --host_crosstool_top=@rbe_default//cc:toolchain
-# override the config-agnostic crosstool_top
-build:msan --crosstool_top=@rbe_msan//cc:toolchain
 
 # thread sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific

tools/remote_build/windows.bazelrc

@@ -1,13 +1,12 @@
 import %workspace%/tools/remote_build/include/rbe_remote_execution.bazelrc
 
 # Next section is windows-specific RBE configuration
-build --host_crosstool_top=//third_party/toolchains/rbe_windows_bazel_5.2.0_vs2019:toolchain
+build --crosstool_top=//third_party/toolchains:rbe_windows_default_toolchain_suite
-build --crosstool_top=//third_party/toolchains/rbe_windows_bazel_5.2.0_vs2019:toolchain
+build --extra_toolchains=//third_party/toolchains:rbe_windows_default_cc_toolchain
-build --extra_toolchains=//third_party/toolchains/rbe_windows_bazel_5.2.0_vs2019:cc-toolchain-x64_windows
 # Use custom execution platforms defined in third_party/toolchains
-build --extra_execution_platforms=//third_party/toolchains:rbe_windows
+build --extra_execution_platforms=//third_party/toolchains:rbe_windows_default_platform
-build --host_platform=//third_party/toolchains:rbe_windows
+build --host_platform=//third_party/toolchains:rbe_windows_default_platform
-build --platforms=//third_party/toolchains:rbe_windows
+build --platforms=//third_party/toolchains:rbe_windows_default_platform
 # Needs to match the location of binaries in the RBE docker container
 build --shell_executable=C:\\msys64\\usr\\bin\\bash.exe
 build --python_path="C:\\Program Files\\Python310\\python.exe"