Skip to content

Commit 5ce12ee

Browse files
katrecopybara-github
authored andcommitted
Remove the obsolete exec_tools attribute from genrule.
Part of #19132. Closes #19142. PiperOrigin-RevId: 554449594 Change-Id: I3d175ad0b7501aa534f3a8965335be0b07d7fb01
1 parent 15b1575 commit 5ce12ee

File tree

2 files changed

+0
-30
lines changed

2 files changed

+0
-30
lines changed

src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.devtools.build.lib.bazel.rules.genrule;
1616

17-
import com.google.devtools.build.lib.analysis.CommandHelper;
1817
import com.google.devtools.build.lib.analysis.RuleContext;
1918
import com.google.devtools.build.lib.packages.Type;
2019
import com.google.devtools.build.lib.rules.genrule.GenRuleBase;
@@ -31,14 +30,4 @@ protected boolean isStampingEnabled(RuleContext ruleContext) {
3130
}
3231
return ruleContext.attributes().get("stamp", Type.BOOLEAN);
3332
}
34-
35-
// TODO(https://github.com/bazelbuild/bazel/issues/19132): Remove this override once downstream
36-
// projects are migrated.
37-
@Override
38-
protected CommandHelper.Builder commandHelperBuilder(RuleContext ruleContext) {
39-
return CommandHelper.builder(ruleContext)
40-
.addToolDependencies("tools")
41-
.addToolDependencies("exec_tools")
42-
.addToolDependencies("toolchains");
43-
}
4433
}

src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515

1616
import static com.google.devtools.build.lib.packages.Attribute.attr;
1717
import static com.google.devtools.build.lib.packages.BuildType.LABEL;
18-
import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
1918
import static com.google.devtools.build.lib.packages.Type.BOOLEAN;
2019

2120
import com.google.devtools.build.lib.analysis.RuleDefinition;
2221
import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
2322
import com.google.devtools.build.lib.analysis.config.ExecutionTransitionFactory;
2423
import com.google.devtools.build.lib.packages.RuleClass;
2524
import com.google.devtools.build.lib.rules.genrule.GenRuleBaseRule;
26-
import com.google.devtools.build.lib.util.FileTypeSet;
2725

2826
/**
2927
* Rule definition for genrule for Bazel.
@@ -46,23 +44,6 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env)
4644
.cfg(ExecutionTransitionFactory.createFactory())
4745
.value(env.getToolsLabel(GENRULE_SETUP_LABEL)))
4846

49-
// TODO(https://github.com/bazelbuild/bazel/issues/19132): Remove this once downstream
50-
// projects are migrated.
51-
/* <!-- #BLAZE_RULE(genrule).ATTRIBUTE(exec_tools) -->
52-
<b>Deprecated. Use <a href="#genrule.tools"><code>tools</code></a> instead.</b>
53-
54-
<p>
55-
There was a period of time when <code>exec_tools</code> and <code>tools</code> behaved
56-
differently, but they are now equivalent and the Blaze team will be migrating all uses of
57-
<code>exec_tools</code> to <code>tools</code>.
58-
</p>
59-
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
60-
.add(
61-
attr("exec_tools", LABEL_LIST)
62-
.cfg(ExecutionTransitionFactory.createFactory())
63-
.allowedFileTypes(FileTypeSet.ANY_FILE)
64-
.dontCheckConstraints())
65-
6647
// TODO(bazel-team): stamping doesn't seem to work. Fix it or remove attribute.
6748
.add(attr("stamp", BOOLEAN).value(false))
6849
.build();

0 commit comments

Comments
 (0)