From 70f9992d77e67f90234b079eabaa33210d866c87 Mon Sep 17 00:00:00 2001
From: Bill Feng <yfen@google.com>
Date: Mon, 26 Nov 2018 10:10:53 -0800
Subject: [PATCH] modified execution platform registration, added host platform

---
 WORKSPACE                             |  4 ----
 third_party/toolchains/BUILD          | 22 ++++++++++++++++++++++
 tools/remote_build/rbe_common.bazelrc |  3 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index cd2718204d1..1340ba0c6be 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -6,10 +6,6 @@ grpc_deps()
 
 grpc_test_only_deps()
 
-register_execution_platforms(
-    "//third_party/toolchains:all",
-)
-
 register_toolchains(
     "//third_party/toolchains:all",
 )
diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD
index 7506c6a1fbb..39699f31123 100644
--- a/third_party/toolchains/BUILD
+++ b/third_party/toolchains/BUILD
@@ -74,6 +74,28 @@ platform(
     """,
 )
 
+platform(
+    name = "host_platform-large",
+    constraint_values = [
+        "//third_party/toolchains/machine_size:large",
+    ],
+    cpu_constraints = [
+        "@bazel_tools//platforms:x86_32",
+        "@bazel_tools//platforms:x86_64",
+        "@bazel_tools//platforms:ppc",
+        "@bazel_tools//platforms:arm",
+        "@bazel_tools//platforms:aarch64",
+        "@bazel_tools//platforms:s390x",
+    ],
+    host_platform = True,
+    os_constraints = [
+        "@bazel_tools//platforms:osx",
+        "@bazel_tools//platforms:freebsd",
+        "@bazel_tools//platforms:linux",
+        "@bazel_tools//platforms:windows",
+    ],
+)
+
 # This target is auto-generated from release/cpp.tpl and should not be
 # modified directly.
 toolchain(
diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc
index 77ce96b8d4a..c1ee4280822 100644
--- a/tools/remote_build/rbe_common.bazelrc
+++ b/tools/remote_build/rbe_common.bazelrc
@@ -21,7 +21,7 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
 build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain
 build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default
 # Use custom execution platforms defined in third_party/toolchains
-build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large
+build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large,//third_party/toolchains:host_platform-large
 build --host_platform=//third_party/toolchains:rbe_ubuntu1604
 build --platforms=//third_party/toolchains:rbe_ubuntu1604
 
@@ -69,6 +69,7 @@ build:tsan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 build:tsan --test_timeout=3600
 build:tsan --test_tag_filters=-qps_json_driver,-json_run_localhost
+build:tsan --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large
 
 # undefined behavior sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific