Remove TransitionMode from RuleContext prerequisite calls.
Part of removing TransitionMode entirely.
PiperOrigin-RevId: 329330624
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java b/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java
index c63ca9b..1dfa950 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java
@@ -102,8 +102,7 @@
continue;
}
Preconditions.checkArgument(ruleContext.isAttrDefined(attributeName, LABEL), attributeName);
- TransitiveInfoCollection packageGroup =
- ruleContext.getPrerequisite(attributeName, TransitionMode.HOST);
+ TransitiveInfoCollection packageGroup = ruleContext.getPrerequisite(attributeName);
PackageSpecificationProvider packageSpecificationProvider =
packageGroup.getProvider(PackageSpecificationProvider.class);
return requireNonNull(packageSpecificationProvider, packageGroup.getLabel().toString());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index a1cb8b6..1a26394 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -146,7 +146,6 @@
":toolchain_collection",
":toolchain_context",
":top_level_artifact_context",
- ":transition_mode",
":transitive_info_collection",
":transitive_info_provider",
":transitive_info_provider_effective_class_helper",
@@ -1297,7 +1296,6 @@
":actions/abstract_file_write_action",
":actions/deterministic_writer",
":analysis_cluster",
- ":transition_mode",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
index a20402d..49e5df9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
@@ -79,7 +79,7 @@
*/
public Builder addHostToolDependencies(String toolAttributeName) {
List<? extends TransitiveInfoCollection> dependencies =
- ruleContext.getPrerequisites(toolAttributeName, TransitionMode.HOST);
+ ruleContext.getPrerequisites(toolAttributeName);
addToolDependencies(dependencies);
return this;
}
@@ -90,7 +90,7 @@
*/
public Builder addToolDependencies(String toolAttributeName) {
List<? extends TransitiveInfoCollection> dependencies =
- ruleContext.getPrerequisites(toolAttributeName, TransitionMode.TARGET);
+ ruleContext.getPrerequisites(toolAttributeName);
return addToolDependencies(dependencies);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
index 1fb2786..465d8e0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
@@ -50,8 +50,7 @@
.flatMap(
attrName ->
Streams.stream(
- ruleContext.getPrerequisites(
- attrName, TransitionMode.DONT_CHECK, TemplateVariableInfo.PROVIDER)))
+ ruleContext.getPrerequisites(attrName, TemplateVariableInfo.PROVIDER)))
.collect(Collectors.toList());
providers.addAll(fromAttributes);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionUtils.java b/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionUtils.java
index 714722e..3ef29bb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionUtils.java
@@ -94,7 +94,7 @@
// We copy the multimap here every time. This could be expensive.
Multimap<String, ExtraActionSpec> mnemonicToExtraActionMap = HashMultimap.create();
for (TransitiveInfoCollection actionListener :
- ruleContext.getPrerequisites(":action_listener", TransitionMode.HOST)) {
+ ruleContext.getPrerequisites(":action_listener")) {
ExtraActionMapProvider provider = actionListener.getProvider(ExtraActionMapProvider.class);
if (provider == null) {
ruleContext.ruleError(String.format(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
index e5a1c95..2e03c2b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
@@ -372,7 +372,7 @@
if (ruleContext.getRule().isAttrDefined("srcs", BuildType.LABEL_LIST)) {
for (TransitiveInfoCollection src :
- ruleContext.getPrerequisitesIf("srcs", TransitionMode.TARGET, FileProvider.class)) {
+ ruleContext.getPrerequisitesIf("srcs", FileProvider.class)) {
for (Label label : AliasProvider.getDependencyLabels(src)) {
mapGet(locationMap, label)
.addAll(src.getProvider(FileProvider.class).getFilesToBuild().toList());
@@ -384,21 +384,16 @@
List<TransitiveInfoCollection> depsDataAndTools = new ArrayList<>();
if (ruleContext.getRule().isAttrDefined("deps", BuildType.LABEL_LIST)) {
Iterables.addAll(
- depsDataAndTools,
- ruleContext.getPrerequisitesIf(
- "deps", TransitionMode.DONT_CHECK, FilesToRunProvider.class));
+ depsDataAndTools, ruleContext.getPrerequisitesIf("deps", FilesToRunProvider.class));
}
if (allowDataAttributeEntriesInLabel
&& ruleContext.getRule().isAttrDefined("data", BuildType.LABEL_LIST)) {
Iterables.addAll(
- depsDataAndTools,
- ruleContext.getPrerequisitesIf(
- "data", TransitionMode.DONT_CHECK, FilesToRunProvider.class));
+ depsDataAndTools, ruleContext.getPrerequisitesIf("data", FilesToRunProvider.class));
}
if (ruleContext.getRule().isAttrDefined("tools", BuildType.LABEL_LIST)) {
Iterables.addAll(
- depsDataAndTools,
- ruleContext.getPrerequisitesIf("tools", TransitionMode.HOST, FilesToRunProvider.class));
+ depsDataAndTools, ruleContext.getPrerequisitesIf("tools", FilesToRunProvider.class));
}
for (TransitiveInfoCollection dep : depsDataAndTools) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index e5781e6..266a702 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -287,8 +287,7 @@
ruleContext.attributes().getAttributeDefinition(attributeName).getType();
if (attributeType.getLabelClass() == LabelClass.DEPENDENCY) {
for (TransitiveLabelsInfo labelsInfo :
- ruleContext.getPrerequisites(
- attributeName, TransitionMode.DONT_CHECK, TransitiveLabelsInfo.class)) {
+ ruleContext.getPrerequisites(attributeName, TransitiveLabelsInfo.class)) {
nestedSetBuilder.addTransitive(labelsInfo.getLabels());
}
}
@@ -320,8 +319,7 @@
&& attribute.getType().getLabelClass() == LabelClass.DEPENDENCY) {
for (OutputGroupInfo outputGroup :
- ruleContext.getPrerequisites(
- attributeName, TransitionMode.DONT_CHECK, OutputGroupInfo.STARLARK_CONSTRUCTOR)) {
+ ruleContext.getPrerequisites(attributeName, OutputGroupInfo.STARLARK_CONSTRUCTOR)) {
NestedSet<Artifact> validationArtifacts =
outputGroup.getOutputGroup(OutputGroupInfo.VALIDATION);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
index 61396d8..481f6c1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -895,9 +895,7 @@
* Collects runfiles from data dependencies of a target.
*/
public Builder addDataDeps(RuleContext ruleContext) {
- addTargets(
- getPrerequisites(ruleContext, "data", TransitionMode.DONT_CHECK),
- RunfilesProvider.DATA_RUNFILES);
+ addTargets(getPrerequisites(ruleContext, "data"), RunfilesProvider.DATA_RUNFILES);
return this;
}
@@ -1022,8 +1020,7 @@
// dependent rules in srcs (except for filegroups and such), but always in deps.
// TODO(bazel-team): DONT_CHECK is not optimal here. Rules that use split configs need to
// be changed not to call into here.
- getPrerequisites(ruleContext, "srcs", TransitionMode.DONT_CHECK),
- getPrerequisites(ruleContext, "deps", TransitionMode.DONT_CHECK));
+ getPrerequisites(ruleContext, "srcs"), getPrerequisites(ruleContext, "deps"));
}
/**
@@ -1034,9 +1031,9 @@
* <p>If the rule does not have the specified attribute, returns the empty list.
*/
private static Iterable<? extends TransitiveInfoCollection> getPrerequisites(
- RuleContext ruleContext, String attributeName, TransitionMode mode) {
+ RuleContext ruleContext, String attributeName) {
if (ruleContext.getRule().isAttrDefined(attributeName, BuildType.LABEL_LIST)) {
- return ruleContext.getPrerequisites(attributeName, mode);
+ return ruleContext.getPrerequisites(attributeName);
} else {
return Collections.emptyList();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
index 2f4b074..14f9955 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
@@ -105,8 +105,7 @@
if (runUnder != null
&& runUnder.getLabel() != null
&& TargetUtils.isTestRule(ruleContext.getRule())) {
- TransitiveInfoCollection runUnderTarget =
- ruleContext.getPrerequisite(":run_under", TransitionMode.DONT_CHECK);
+ TransitiveInfoCollection runUnderTarget = ruleContext.getPrerequisite(":run_under");
runfiles =
new Runfiles.Builder(
ruleContext.getWorkspaceName(),
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java
index 7a72d63..126706b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java
@@ -23,7 +23,6 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.util.Fingerprint;
@@ -54,7 +53,7 @@
new LauncherFileWriteAction(
ruleContext.getActionOwner(),
output,
- ruleContext.getPrerequisiteArtifact("$launcher", TransitionMode.HOST),
+ ruleContext.getPrerequisiteArtifact("$launcher"),
launchInfo));
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java b/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java
index 003deda..a47b9fa 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java
@@ -24,7 +24,6 @@
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.LabelAndLocation;
import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfiguredTarget;
import com.google.devtools.build.lib.analysis.constraints.EnvironmentCollection.EnvironmentWithGroup;
@@ -231,8 +230,7 @@
return EnvironmentCollection.EMPTY;
}
EnvironmentCollection.Builder environments = new EnvironmentCollection.Builder();
- for (TransitiveInfoCollection envTarget :
- ruleContext.getPrerequisites(attrName, TransitionMode.DONT_CHECK)) {
+ for (TransitiveInfoCollection envTarget : ruleContext.getPrerequisites(attrName)) {
EnvironmentWithGroup envInfo = resolveEnvironment(envTarget);
environments.put(envInfo.group(), envInfo.environment());
supportedEnvironments.put(envInfo.group(), envInfo.environment());
@@ -358,7 +356,7 @@
// conceptual sense, we don't know which groups we should apply that to.
String restrictionAttr = RuleClass.RESTRICTED_ENVIRONMENT_ATTR;
List<? extends TransitiveInfoCollection> restrictionEnvironments =
- ruleContext.getPrerequisites(restrictionAttr, TransitionMode.DONT_CHECK);
+ ruleContext.getPrerequisites(restrictionAttr);
if (restrictionEnvironments.isEmpty()
&& attributes.isAttributeValueExplicitlySpecified(restrictionAttr)) {
attributeError(ruleContext, restrictionAttr, "attribute cannot be empty");
@@ -733,8 +731,7 @@
Set<Label> selectOnlyDepsForThisAttribute =
getDepsOnlyInSelects(ruleContext, attr, attributes.getAttributeType(attr));
- for (TransitiveInfoCollection dep :
- ruleContext.getPrerequisites(attr, TransitionMode.DONT_CHECK)) {
+ for (TransitiveInfoCollection dep : ruleContext.getPrerequisites(attr)) {
// Output files inherit the environment spec of their generating rule.
if (dep instanceof OutputFileConfiguredTarget) {
// Note this reassignment means constraint violation errors reference the generating
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
index ce8f6fe..d0ba263 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
@@ -17,7 +17,6 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.AliasProvider;
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
-import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Attribute;
@@ -171,9 +170,7 @@
if (a.isExecutable()) {
// In Starlark only label (not label list) type attributes can have the Executable flag.
FilesToRunProvider provider =
- context
- .getRuleContext()
- .getExecutablePrerequisite(a.getName(), TransitionMode.DONT_CHECK);
+ context.getRuleContext().getExecutablePrerequisite(a.getName());
if (provider != null && provider.getExecutable() != null) {
Artifact executable = provider.getExecutable();
executableBuilder.put(skyname, executable);
@@ -193,10 +190,7 @@
}
if (a.isSingleArtifact()) {
// In Starlark only label (not label list) type attributes can have the SingleArtifact flag.
- Artifact artifact =
- context
- .getRuleContext()
- .getPrerequisiteArtifact(a.getName(), TransitionMode.DONT_CHECK);
+ Artifact artifact = context.getRuleContext().getPrerequisiteArtifact(a.getName());
if (artifact != null) {
fileBuilder.put(skyname, artifact);
} else {
@@ -207,28 +201,23 @@
skyname,
StarlarkList.copyOf(
/*mutability=*/ null,
- context
- .getRuleContext()
- .getPrerequisiteArtifacts(a.getName(), TransitionMode.DONT_CHECK)
- .list()));
+ context.getRuleContext().getPrerequisiteArtifacts(a.getName()).list()));
if (type == BuildType.LABEL && !a.getTransitionFactory().isSplit()) {
- Object prereq =
- context.getRuleContext().getPrerequisite(a.getName(), TransitionMode.DONT_CHECK);
+ Object prereq = context.getRuleContext().getPrerequisite(a.getName());
if (prereq == null) {
prereq = Starlark.NONE;
}
attrBuilder.put(skyname, prereq);
} else if (type == BuildType.LABEL_LIST
|| (type == BuildType.LABEL && a.getTransitionFactory().isSplit())) {
- List<?> allPrereq =
- context.getRuleContext().getPrerequisites(a.getName(), TransitionMode.DONT_CHECK);
+ List<?> allPrereq = context.getRuleContext().getPrerequisites(a.getName());
attrBuilder.put(skyname, StarlarkList.immutableCopyOf(allPrereq));
} else if (type == BuildType.LABEL_KEYED_STRING_DICT) {
ImmutableMap.Builder<TransitiveInfoCollection, String> builder = ImmutableMap.builder();
Map<Label, String> original = BuildType.LABEL_KEYED_STRING_DICT.cast(val);
List<? extends TransitiveInfoCollection> allPrereq =
- context.getRuleContext().getPrerequisites(a.getName(), TransitionMode.DONT_CHECK);
+ context.getRuleContext().getPrerequisites(a.getName());
for (TransitiveInfoCollection prereq : allPrereq) {
builder.put(prereq, original.get(AliasProvider.getDependencyLabel(prereq)));
}
@@ -236,7 +225,7 @@
} else if (type == BuildType.LABEL_DICT_UNARY) {
Map<Label, TransitiveInfoCollection> prereqsByLabel = new LinkedHashMap<>();
for (TransitiveInfoCollection target :
- context.getRuleContext().getPrerequisites(a.getName(), TransitionMode.DONT_CHECK)) {
+ context.getRuleContext().getPrerequisites(a.getName())) {
prereqsByLabel.put(target.getLabel(), target);
}
ImmutableMap.Builder<String, TransitiveInfoCollection> attrValue = ImmutableMap.builder();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesCollector.java b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesCollector.java
index 3421c3e..6d99f6c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesCollector.java
@@ -20,7 +20,6 @@
import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
@@ -420,7 +419,7 @@
for (String attr : attributeNames) {
if (ruleContext.getRule().isAttrDefined(attr, BuildType.LABEL_LIST) ||
ruleContext.getRule().isAttrDefined(attr, BuildType.LABEL)) {
- prerequisites.addAll(ruleContext.getPrerequisites(attr, TransitionMode.DONT_CHECK));
+ prerequisites.addAll(ruleContext.getPrerequisites(attr));
}
}
return prerequisites;
@@ -432,8 +431,7 @@
for (Attribute attr : ruleContext.getRule().getAttributes()) {
if ((attr.getType() == BuildType.LABEL_LIST || attr.getType() == BuildType.LABEL)
&& !attr.getTransitionFactory().isTool()) {
- prerequisites.addAll(
- ruleContext.getPrerequisites(attr.getName(), TransitionMode.DONT_CHECK));
+ prerequisites.addAll(ruleContext.getPrerequisites(attr.getName()));
}
}
return prerequisites;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
index 46bdc62..2e178e3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
@@ -32,7 +32,6 @@
import com.google.devtools.build.lib.analysis.RunfilesSupplierImpl;
import com.google.devtools.build.lib.analysis.RunfilesSupport;
import com.google.devtools.build.lib.analysis.ShToolchain;
-import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.actions.LazyWriteNestedSetOfPairAction;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -175,7 +174,7 @@
if (!isUsingTestWrapperInsteadOfTestSetupScript) {
NestedSet<Artifact> testRuntime =
- PrerequisiteArtifacts.nestedSet(ruleContext, "$test_runtime", TransitionMode.HOST);
+ PrerequisiteArtifacts.nestedSet(ruleContext, "$test_runtime");
inputsBuilder.addTransitive(testRuntime);
}
TestTargetProperties testProperties =
@@ -212,8 +211,7 @@
NestedSet<Artifact> metadataFiles = instrumentedFiles.getInstrumentationMetadataFiles();
inputsBuilder.addTransitive(metadataFiles);
inputsBuilder.addTransitive(
- PrerequisiteArtifacts.nestedSet(
- ruleContext, ":coverage_support", TransitionMode.DONT_CHECK));
+ PrerequisiteArtifacts.nestedSet(ruleContext, ":coverage_support"));
if (ruleContext.isAttrDefined("$collect_cc_coverage", LABEL)) {
Artifact collectCcCoverage =
@@ -248,8 +246,7 @@
lcovMergerAttr = "$lcov_merger";
}
if (lcovMergerAttr != null) {
- TransitiveInfoCollection lcovMerger =
- ruleContext.getPrerequisite(lcovMergerAttr, TransitionMode.TARGET);
+ TransitiveInfoCollection lcovMerger = ruleContext.getPrerequisite(lcovMergerAttr);
FilesToRunProvider lcovFilesToRun = lcovMerger.getProvider(FilesToRunProvider.class);
if (lcovFilesToRun != null) {
extraTestEnv.put(LCOV_MERGER, lcovFilesToRun.getExecutable().getExecPathString());
@@ -416,7 +413,7 @@
// contain rules with baseline coverage but no test rules that have coverage enabled, and in
// that case, we still need the report generator.
TransitiveInfoCollection reportGeneratorTarget =
- ruleContext.getPrerequisite(":coverage_report_generator", TransitionMode.HOST);
+ ruleContext.getPrerequisite(":coverage_report_generator");
reportGenerator = reportGeneratorTarget.getProvider(FilesToRunProvider.class);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetExecutionSettings.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetExecutionSettings.java
index 41407a4..7ab603c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetExecutionSettings.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetExecutionSettings.java
@@ -24,7 +24,6 @@
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.Runfiles;
import com.google.devtools.build.lib.analysis.RunfilesSupport;
-import com.google.devtools.build.lib.analysis.TransitionMode;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.actions.Compression;
import com.google.devtools.build.lib.analysis.actions.FileWriteAction;
@@ -114,8 +113,7 @@
}
private static Artifact getRunUnderExecutable(RuleContext ruleContext) {
- TransitiveInfoCollection runUnderTarget =
- ruleContext.getPrerequisite(":run_under", TransitionMode.DONT_CHECK);
+ TransitiveInfoCollection runUnderTarget = ruleContext.getPrerequisite(":run_under");
return runUnderTarget == null
? null
: runUnderTarget.getProvider(FilesToRunProvider.class).getExecutable();
