cleanup

third_party/toolchains/BUILD

@@ -74,28 +74,6 @@ 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(

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,//third_party/toolchains:host_platform-large
+build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large
 build --host_platform=//third_party/toolchains:rbe_ubuntu1604
 build --platforms=//third_party/toolchains:rbe_ubuntu1604
 
@@ -37,7 +37,6 @@ build --verbose_failures=true
 
 build --experimental_strict_action_env=true
 build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-build --toolchain_resolution_debug
 
 # don't use port server
 build --define GRPC_PORT_ISOLATED_RUNTIME=1