Skip to content

Commit 823b7e3

Browse files
committed
Remove the obsolete exec_tools attribute from genrule.
DO NOT SUBMIT. Part of bazelbuild#19132.
1 parent 6a313f1 commit 823b7e3

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,4 @@ protected boolean isStampingEnabled(RuleContext ruleContext) {
3131
}
3232
return ruleContext.attributes().get("stamp", Type.BOOLEAN);
3333
}
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-
}
4434
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,6 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env)
4646
.cfg(ExecutionTransitionFactory.createFactory())
4747
.value(env.getToolsLabel(GENRULE_SETUP_LABEL)))
4848

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-
6649
// TODO(bazel-team): stamping doesn't seem to work. Fix it or remove attribute.
6750
.add(attr("stamp", BOOLEAN).value(false))
6851
.build();

0 commit comments

Comments
 (0)