Skip to content

Commit ccfeeff

Browse files
gregestrencopybara-github
authored andcommitted
Remove obsolete addHostToolDependencies.
PiperOrigin-RevId: 501313386 Change-Id: I78b465572f6cd5d64b4ce45101631fda113b6887
1 parent 3368874 commit ccfeeff

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,6 @@ private Builder(RuleContext ruleContext) {
7373
this.ruleContext = ruleContext;
7474
}
7575

76-
/**
77-
* Adds tools, as a set of executable binaries, by fetching them from the given attribute on the
78-
* {@code ruleContext}. Populates manifests, remoteRunfiles and label map where required.
79-
*/
80-
@CanIgnoreReturnValue
81-
public Builder addHostToolDependencies(String toolAttributeName) {
82-
List<? extends TransitiveInfoCollection> dependencies =
83-
ruleContext.getPrerequisites(toolAttributeName);
84-
addToolDependencies(dependencies);
85-
return this;
86-
}
87-
8876
/**
8977
* Adds tools, as a set of executable binaries, by fetching them from the given attribute on the
9078
* {@code ruleContext}. Populates manifests, remoteRunfiles and label map where required.

src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ConfiguredTarget create(RuleContext context)
4848
List<Artifact> resolvedData = Lists.newArrayList();
4949

5050
CommandHelper commandHelper =
51-
CommandHelper.builder(context).addHostToolDependencies("tools").build();
51+
CommandHelper.builder(context).addToolDependencies("tools").build();
5252

5353
resolvedData.addAll(context.getPrerequisiteArtifacts("data").list());
5454
List<String>outputTemplates =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ public String toString() {
283283

284284
protected CommandHelper.Builder commandHelperBuilder(RuleContext ruleContext) {
285285
return CommandHelper.builder(ruleContext)
286-
.addHostToolDependencies("tools")
286+
.addToolDependencies("tools")
287287
.addToolDependencies("exec_tools")
288-
.addHostToolDependencies("toolchains");
288+
.addToolDependencies("toolchains");
289289
}
290290

291291
/**

0 commit comments

Comments
 (0)