Automated rollback of commit 2b983bdf508e010a3d4ee9dbaf446b7666749799.

*** Reason for rollback ***

Breaks rules_go CI

*** Original change description ***

Rollforward of c++ toolchain-relevant BUILD file and Bazel mocking changes.  That is, a c++ toolchain is added, but a Bazel dependency on that toolchain is not.

PiperOrigin-RevId: 167198874

2 files changed, 4 insertions, 59 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index 862b213eab..0defa523b1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -77,6 +77,7 @@ public final class BazelMockCcSupport extends MockCcSupport {
     config.create(
         "/bazel_tools_workspace/tools/cpp/BUILD",
         "package(default_visibility=['//visibility:public'])",
+        "toolchain_type(name = 'toolchain_type')",
         "cc_library(name = 'stl')",
         "cc_library(name = 'malloc')",
         "cc_toolchain_suite(",
@@ -122,7 +123,7 @@ public final class BazelMockCcSupport extends MockCcSupport {
         "    linker_files = ':empty',",
         "    module_map = 'crosstool.cppmap', supports_header_parsing = 1,",
         "    objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',",
-        ")",
+        ")", 
         "cc_toolchain(name = 'cc-compiler-armeabi-v7a', all_files = ':empty', ",
         "    compiler_files = ':empty',",
         "    cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ",
@@ -144,27 +145,8 @@ public final class BazelMockCcSupport extends MockCcSupport {
         "filegroup(",
         "    name = 'link_dynamic_library',",
         "    srcs = ['link_dynamic_library.sh'],",
-        ")",
-        "toolchain_type(name = 'toolchain_type')",
-        "toolchain(",
-        "   name = 'toolchain_cc-compiler-piii',",
-        "   toolchain_type = ':toolchain_type',",
-        "   toolchain = '//third_party/crosstool/mock:cc-compiler-piii',",
-        "   target_compatible_with = [':mock_value'],",
-        ")",
-        "toolchain(",
-        "   name = 'dummy_cc_toolchain',",
-        "   toolchain_type = ':toolchain_type',",
-        "   toolchain = ':dummy_cc_toolchain_impl',",
-        ")",
-        "load(':dummy_toolchain.bzl', 'dummy_toolchain')",
-        "dummy_toolchain(name = 'dummy_cc_toolchain_impl')");
-    config.create(
-        "/bazel_tools_workspace/tools/cpp/dummy_toolchain.bzl",
-        "def _dummy_toolchain_impl(ctx):",
-        "   toolchain = platform_common.ToolchainInfo()",
-        "   return [toolchain]",
-        "dummy_toolchain = rule(_dummy_toolchain_impl, attrs = {})");
+        ")");
+
     config.create(
         "/bazel_tools_workspace/tools/cpp/CROSSTOOL",
         readCrosstoolFile());
@@ -174,7 +156,6 @@ public final class BazelMockCcSupport extends MockCcSupport {
       config.create("tools/cpp/link_dynamic_library.sh", "");
     }
     MockObjcSupport.setup(config);
-    MockPlatformSupport.setup(config, "/bazel_tools_workspace/tools/platforms");
   }
 
   @Override
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
deleted file mode 100644
index f2d89fbbe4..0000000000
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 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.
-package com.google.devtools.build.lib.packages.util;
-
-import java.io.IOException;
-
-/** Mocking support for platforms and toolchains. */
-public class MockPlatformSupport {
-
-  /** Adds mocks for basic host and target platform. */
-  public static void setup(MockToolsConfig mockToolsConfig, String platformsPath)
-      throws IOException {
-    mockToolsConfig.create(
-        platformsPath + "/BUILD",
-        "package(default_visibility=['//visibility:public'])",
-        "platform(",
-        "   name = 'target_platform',",
-        "   target_platform = True,",
-        ")",
-        "platform(",
-        "   name = 'host_platform',",
-        "   host_platform = True,",
-        ")");
-  }
-}