diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java
index 70557d2f49eacc..967e8fd7801101 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.lib.bazel.rules.genrule;
-import com.google.devtools.build.lib.analysis.CommandHelper;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.rules.genrule.GenRuleBase;
@@ -31,14 +30,4 @@ protected boolean isStampingEnabled(RuleContext ruleContext) {
}
return ruleContext.attributes().get("stamp", Type.BOOLEAN);
}
-
- // TODO(https://github.com/bazelbuild/bazel/issues/19132): Remove this override once downstream
- // projects are migrated.
- @Override
- protected CommandHelper.Builder commandHelperBuilder(RuleContext ruleContext) {
- return CommandHelper.builder(ruleContext)
- .addToolDependencies("tools")
- .addToolDependencies("exec_tools")
- .addToolDependencies("toolchains");
- }
}
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 5055b89fa2f0a9..685925c287ff7c 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
@@ -15,7 +15,6 @@
import static com.google.devtools.build.lib.packages.Attribute.attr;
import static com.google.devtools.build.lib.packages.BuildType.LABEL;
-import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
import static com.google.devtools.build.lib.packages.Type.BOOLEAN;
import com.google.devtools.build.lib.analysis.RuleDefinition;
@@ -23,7 +22,6 @@
import com.google.devtools.build.lib.analysis.config.ExecutionTransitionFactory;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.rules.genrule.GenRuleBaseRule;
-import com.google.devtools.build.lib.util.FileTypeSet;
/**
* Rule definition for genrule for Bazel.
@@ -46,23 +44,6 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env)
.cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel(GENRULE_SETUP_LABEL)))
- // TODO(https://github.com/bazelbuild/bazel/issues/19132): Remove this once downstream
- // projects are migrated.
- /*
- Deprecated. Use tools
instead.
-
-
- There was a period of time when exec_tools
and tools
behaved
- differently, but they are now equivalent and the Blaze team will be migrating all uses of
- exec_tools
to tools
.
-