Rename UnloadedToolchainContextKey to ToolchainContextKey.
Cleanup leading to toolchain transitions, #10523.
Closes #11336.
PiperOrigin-RevId: 311112930
diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
index 02ddc72..8991d0a 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -81,10 +81,10 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:traversal_info_root_package_extractor",
"//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
- "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
"//src/main/java/com/google/devtools/build/lib/supplier",
"//src/main/java/com/google/devtools/build/lib/util",
diff --git a/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetAccessor.java b/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetAccessor.java
index 5c1746f..df63ccb 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetAccessor.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetAccessor.java
@@ -44,8 +44,8 @@
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
import com.google.devtools.build.lib.skyframe.PackageValue;
+import com.google.devtools.build.lib.skyframe.ToolchainContextKey;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
-import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextKey;
import com.google.devtools.build.skyframe.WalkableGraph;
import java.util.List;
import java.util.Map;
@@ -229,7 +229,7 @@
UnloadedToolchainContext context =
(UnloadedToolchainContext)
walkableGraph.getValue(
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(config))
.requiredToolchainTypeLabels(execGroup.getRequiredToolchains())
.execConstraintLabels(execGroup.getExecutionPlatformConstraints())
@@ -242,7 +242,7 @@
UnloadedToolchainContext defaultContext =
(UnloadedToolchainContext)
walkableGraph.getValue(
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(config))
.requiredToolchainTypeLabels(requiredToolchains)
.execConstraintLabels(execConstraintLabels)
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 8c5d7ec..f590ed4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -394,7 +394,7 @@
unloadedToolchainContext =
(UnloadedToolchainContext)
env.getValueOrThrow(
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(configuration))
.requiredToolchainTypeLabels(requiredToolchains)
.shouldSanityCheckConfiguration(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
index 484d0cd..c456dde 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -207,6 +207,7 @@
":test_expansion_function",
":tests_for_target_pattern_function",
":tests_for_target_pattern_value",
+ ":toolchain_context_key",
":toolchain_exception",
":top_down_action_cache",
":transitive_base_traversal_function",
@@ -217,7 +218,6 @@
":transitive_traversal_value",
":tree_artifact_value",
":unloaded_toolchain_context",
- ":unloaded_toolchain_context_key",
":workspace_ast_value",
":workspace_name_function",
":workspace_name_value",
@@ -2479,6 +2479,19 @@
)
java_library(
+ name = "toolchain_context_key",
+ srcs = ["ToolchainContextKey.java"],
+ deps = [
+ ":build_configuration_value",
+ ":sky_functions",
+ "//src/main/java/com/google/devtools/build/lib/cmdline",
+ "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
+ "//third_party:auto_value",
+ "//third_party:guava",
+ ],
+)
+
+java_library(
name = "toolchain_exception",
srcs = ["ToolchainException.java"],
)
@@ -2638,19 +2651,6 @@
)
java_library(
- name = "unloaded_toolchain_context_key",
- srcs = ["UnloadedToolchainContextKey.java"],
- deps = [
- ":build_configuration_value",
- ":sky_functions",
- "//src/main/java/com/google/devtools/build/lib/cmdline",
- "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
- "//third_party:auto_value",
- "//third_party:guava",
- ],
-)
-
-java_library(
name = "workspace_ast_value",
srcs = ["WorkspaceASTValue.java"],
deps = [
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index 0fc7046..cbcb473 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -484,11 +484,11 @@
configuration.getFragmentsMap().keySet(),
BuildOptions.diffForReconstruction(defaultBuildOptions, toolchainOptions));
- Map<String, UnloadedToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
+ Map<String, ToolchainContextKey> toolchainContextKeys = new HashMap<>();
String targetUnloadedToolchainContext = "target-unloaded-toolchain-context";
- unloadedToolchainContextKeys.put(
+ toolchainContextKeys.put(
targetUnloadedToolchainContext,
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(toolchainConfig)
.requiredToolchainTypeLabels(requiredDefaultToolchains)
.execConstraintLabels(defaultExecConstraintLabels)
@@ -496,9 +496,9 @@
.build());
for (Map.Entry<String, ExecGroup> group : execGroups.entrySet()) {
ExecGroup execGroup = group.getValue();
- unloadedToolchainContextKeys.put(
+ toolchainContextKeys.put(
group.getKey(),
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(toolchainConfig)
.requiredToolchainTypeLabels(execGroup.getRequiredToolchains())
.execConstraintLabels(execGroup.getExecutionPlatformConstraints())
@@ -507,14 +507,14 @@
}
Map<SkyKey, ValueOrException<ToolchainException>> values =
- env.getValuesOrThrow(unloadedToolchainContextKeys.values(), ToolchainException.class);
+ env.getValuesOrThrow(toolchainContextKeys.values(), ToolchainException.class);
boolean valuesMissing = env.valuesMissing();
ToolchainCollection.Builder<UnloadedToolchainContext> toolchainContexts =
valuesMissing ? null : new ToolchainCollection.Builder<>();
- for (Map.Entry<String, UnloadedToolchainContextKey> unloadedToolchainContextKey :
- unloadedToolchainContextKeys.entrySet()) {
+ for (Map.Entry<String, ToolchainContextKey> unloadedToolchainContextKey :
+ toolchainContextKeys.entrySet()) {
UnloadedToolchainContext unloadedToolchainContext =
(UnloadedToolchainContext) values.get(unloadedToolchainContextKey.getValue()).get();
if (!valuesMissing) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsCycleReporter.java
index b922b5d..78f8309 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsCycleReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsCycleReporter.java
@@ -88,9 +88,9 @@
((SingleToolchainResolutionKey) input.argument()).toolchainTypeLabel();
return String.format("toolchain type %s", toolchainType);
}
- if (input.argument() instanceof UnloadedToolchainContextKey) {
+ if (input.argument() instanceof ToolchainContextKey) {
ImmutableSet<Label> toolchainTypes =
- ((UnloadedToolchainContextKey) input.argument()).requiredToolchainTypeLabels();
+ ((ToolchainContextKey) input.argument()).requiredToolchainTypeLabels();
return String.format(
"toolchain types %s",
toolchainTypes.stream().map(Label::toString).collect(joining(", ")));
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/UnloadedToolchainContextKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainContextKey.java
similarity index 90%
rename from src/main/java/com/google/devtools/build/lib/skyframe/UnloadedToolchainContextKey.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/ToolchainContextKey.java
index ad46984..05749e7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/UnloadedToolchainContextKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainContextKey.java
@@ -24,11 +24,11 @@
* UnloadedToolchainContextImpl} instances.
*/
@AutoValue
-public abstract class UnloadedToolchainContextKey implements SkyKey {
+public abstract class ToolchainContextKey implements SkyKey {
/** Returns a new {@link Builder}. */
public static Builder key() {
- return new AutoValue_UnloadedToolchainContextKey.Builder()
+ return new AutoValue_ToolchainContextKey.Builder()
.requiredToolchainTypeLabels(ImmutableSet.of())
.execConstraintLabels(ImmutableSet.of())
.shouldSanityCheckConfiguration(false);
@@ -47,7 +47,7 @@
abstract boolean shouldSanityCheckConfiguration();
- /** Builder for {@link UnloadedToolchainContextKey}. */
+ /** Builder for {@link ToolchainContextKey}. */
@AutoValue.Builder
public interface Builder {
Builder configurationKey(BuildConfigurationValue.Key key);
@@ -62,6 +62,6 @@
Builder shouldSanityCheckConfiguration(boolean shouldSanityCheckConfiguration);
- UnloadedToolchainContextKey build();
+ ToolchainContextKey build();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
index f5e8c0bb..4db4eaf 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
@@ -62,7 +62,7 @@
@Override
public UnloadedToolchainContext compute(SkyKey skyKey, Environment env)
throws ToolchainResolutionFunctionException, InterruptedException {
- UnloadedToolchainContextKey key = (UnloadedToolchainContextKey) skyKey.argument();
+ ToolchainContextKey key = (ToolchainContextKey) skyKey.argument();
try {
UnloadedToolchainContextImpl.Builder builder = UnloadedToolchainContextImpl.builder();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
index 8678905..d241ca4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
@@ -104,9 +104,9 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_phase_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_exception",
"//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
- "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
"//src/main/java/com/google/devtools/build/lib/util",
"//src/main/java/com/google/devtools/build/lib/util:filetype",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
index 60c85e7..2badb26 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
@@ -84,9 +84,9 @@
import com.google.devtools.build.lib.skyframe.SkyframeBuildView;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.skyframe.TargetPatternPhaseValue;
+import com.google.devtools.build.lib.skyframe.ToolchainContextKey;
import com.google.devtools.build.lib.skyframe.ToolchainException;
import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
-import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextKey;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.util.OrderedSetMultimap;
import com.google.devtools.build.skyframe.SkyKey;
@@ -501,31 +501,31 @@
SkyFunctionEnvironmentForTesting skyfunctionEnvironment =
skyframeExecutor.getSkyFunctionEnvironmentForTesting(eventHandler);
- Map<String, UnloadedToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
+ Map<String, ToolchainContextKey> toolchainContextKeys = new HashMap<>();
for (Map.Entry<String, ExecGroup> execGroup : execGroups.entrySet()) {
- unloadedToolchainContextKeys.put(
+ toolchainContextKeys.put(
execGroup.getKey(),
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(targetConfig))
.requiredToolchainTypeLabels(execGroup.getValue().getRequiredToolchains())
.build());
}
String targetUnloadedToolchainContextKey = "target-unloaded-toolchain-context";
- unloadedToolchainContextKeys.put(
+ toolchainContextKeys.put(
targetUnloadedToolchainContextKey,
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey.key()
.configurationKey(BuildConfigurationValue.key(targetConfig))
.requiredToolchainTypeLabels(requiredToolchains)
.build());
Map<SkyKey, ValueOrException<ToolchainException>> values =
skyfunctionEnvironment.getValuesOrThrow(
- unloadedToolchainContextKeys.values(), ToolchainException.class);
+ toolchainContextKeys.values(), ToolchainException.class);
ToolchainCollection.Builder<UnloadedToolchainContext> unloadedToolchainContexts =
new ToolchainCollection.Builder<>();
- for (Map.Entry<String, UnloadedToolchainContextKey> unloadedToolchainContextKey :
- unloadedToolchainContextKeys.entrySet()) {
+ for (Map.Entry<String, ToolchainContextKey> unloadedToolchainContextKey :
+ toolchainContextKeys.entrySet()) {
UnloadedToolchainContext unloadedToolchainContext =
(UnloadedToolchainContext) values.get(unloadedToolchainContextKey.getValue()).get();
String execGroup = unloadedToolchainContextKey.getKey();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index d030cab..81d147e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -225,7 +225,7 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:tree_artifact_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
- "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_ast_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
index 02d8c04..4161f47 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
@@ -66,8 +66,8 @@
"register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -110,8 +110,8 @@
"alias/BUILD", "alias(name = 'toolchain_type', actual = '//toolchain:test_toolchain')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(aliasedToolchainTypeLabel)
.build();
@@ -142,8 +142,7 @@
rewriteWorkspace("register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--host_platform=//host:host", "--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key().configurationKey(targetConfigKey).build();
+ ToolchainContextKey key = ToolchainContextKey.key().configurationKey(targetConfigKey).build();
EvaluationResult<UnloadedToolchainContext> result = invokeToolchainResolution(key);
@@ -178,8 +177,8 @@
" '//sample:sample_a', '//sample:sample_b')");
useConfiguration("--host_platform=//host:host", "--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.execConstraintLabels(Label.parseAbsoluteUnchecked("//sample:demo_b"))
.build();
@@ -205,8 +204,8 @@
public void resolve_unavailableToolchainType_single() throws Exception {
scratch.file("fake/toolchain/BUILD", "");
useConfiguration("--host_platform=//platforms:linux", "--platforms=//platforms:mac");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(
testToolchainTypeLabel, Label.parseAbsoluteUnchecked("//fake/toolchain:type_1"))
@@ -229,8 +228,8 @@
public void resolve_unavailableToolchainType_multiple() throws Exception {
scratch.file("fake/toolchain/BUILD", "");
useConfiguration("--host_platform=//platforms:linux", "--platforms=//platforms:mac");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(
testToolchainTypeLabel,
@@ -251,8 +250,8 @@
public void resolve_invalidTargetPlatform_badTarget() throws Exception {
scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
useConfiguration("--platforms=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -277,8 +276,8 @@
public void resolve_invalidTargetPlatform_badPackage() throws Exception {
scratch.resolve("invalid").delete();
useConfiguration("--platforms=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -301,8 +300,8 @@
public void resolve_invalidHostPlatform() throws Exception {
scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
useConfiguration("--host_platform=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -325,8 +324,8 @@
public void resolve_invalidExecutionPlatform() throws Exception {
scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
useConfiguration("--extra_execution_platforms=//invalid:not_a_platform");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.build();
@@ -366,8 +365,8 @@
"register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.execConstraintLabels(Label.parseAbsoluteUnchecked("//constraints:linux"))
@@ -395,8 +394,8 @@
@Test
public void resolve_execConstraints_invalid() throws Exception {
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(testToolchainTypeLabel)
.execConstraintLabels(Label.parseAbsoluteUnchecked("//platforms:linux"))
@@ -447,8 +446,8 @@
"register_execution_platforms('//platforms:mac', '//platforms:linux')");
useConfiguration("--platforms=//platforms:linux");
- UnloadedToolchainContextKey key =
- UnloadedToolchainContextKey.key()
+ ToolchainContextKey key =
+ ToolchainContextKey.key()
.configurationKey(targetConfigKey)
.requiredToolchainTypeLabels(
Label.parseAbsoluteUnchecked("//a:toolchain_type_A"),
