diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java index 490462fdb7..a2e63b9755 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java @@ -31,7 +31,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.Attribute; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter; @@ -113,7 +113,7 @@ public class ToolchainContext { } public void resolveToolchains( - OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) { + OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap) { if (!this.requiredToolchains.isEmpty()) { this.resolvedToolchainProviders = new ResolvedToolchainProviders(findToolchains(resolvedToolchainLabels, prerequisiteMap)); @@ -164,7 +164,7 @@ public class ToolchainContext { private static ImmutableMap<Label, ToolchainInfo> findToolchains( ResolvedToolchainLabels resolvedToolchainLabels, - OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) { + OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap) { // Find the prerequisites associated with the $toolchains attribute. Optional<Attribute> toolchainAttribute = prerequisiteMap @@ -178,7 +178,7 @@ public class ToolchainContext { "No toolchains attribute found while loading resolved toolchains"); ImmutableMap.Builder<Label, ToolchainInfo> toolchains = new ImmutableMap.Builder<>(); - for (ConfiguredTargetAndTarget target : prerequisiteMap.get(toolchainAttribute.get())) { + for (ConfiguredTargetAndData target : prerequisiteMap.get(toolchainAttribute.get())) { Label discoveredLabel = target.getTarget().getLabel(); Label toolchainType = resolvedToolchainLabels.getType(discoveredLabel); if (toolchainType != null) { |