Remove genrule's dependency on the cpp toolchain.

PiperOrigin-RevId: 199627983

2 files changed, 0 insertions, 22 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
index 964cfafce1..d23071bf9b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
@@ -24,7 +24,6 @@ import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.rules.cpp.CcToolchain;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
-import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
 import com.google.devtools.build.lib.rules.genrule.GenRuleBaseRule;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo;
@@ -65,7 +64,6 @@ public final class BazelGenRuleRule implements RuleDefinition {
                 .cfg(HostTransition.INSTANCE)
                 .value(JavaSemantics.hostJdkAttribute(env))
                 .mandatoryProviders(JavaRuntimeInfo.PROVIDER.id()))
-        .addRequiredToolchains(CppRuleClasses.ccToolchainTypeAttribute(env))
         .build();
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java
index 09ed5e403e..d6938814fc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java
@@ -75,26 +75,6 @@ public class CcToolchainSelectionTest extends BuildViewTestCase {
   }
 
   @Test
-  public void testResolvedCcToolchainGenrule() throws Exception {
-    useConfiguration(
-        "--experimental_platforms=//mock_platform:mock-piii-platform",
-        "--extra_toolchains=//mock_platform:toolchain_cc-compiler-piii");
-    ConfiguredTarget target =
-        ScratchAttributeWriter.fromLabelString(this, "genrule", "//gen")
-            .set("cmd", "\"foobar\"")
-            .setList("outs", "out.txt")
-            .write();
-    ResolvedToolchainProviders providers =
-        (ResolvedToolchainProviders)
-            getRuleContext(target).getToolchainContext().getResolvedToolchainProviders();
-    CcToolchainProvider toolchain =
-        (CcToolchainProvider)
-            providers.getForToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE));
-    assertThat(Iterables.getOnlyElement(toolchain.getCompile()).getExecPathString())
-        .endsWith("piii");
-  }
-
-  @Test
   public void testToolchainSelectionWithPlatforms() throws Exception {
     useConfiguration(
         "--enabled_toolchain_types=" + CPP_TOOLCHAIN_TYPE,