Update JavaCompileAction to use SpawnStrategyResolver. Part of the roll-forward of https://github.com/bazelbuild/bazel/commit/37aeabcd39fe326d1c4e55693d8d207f9f7ac6c4. PiperOrigin-RevId: 307023927
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java index 6def05a..c9571cf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -49,7 +49,6 @@ import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnContinuation; import com.google.devtools.build.lib.actions.SpawnResult; -import com.google.devtools.build.lib.actions.SpawnStrategy; import com.google.devtools.build.lib.actions.extra.ExtraActionInfo; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -58,6 +57,7 @@ import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible; +import com.google.devtools.build.lib.exec.SpawnStrategyResolver; import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode; import com.google.devtools.build.lib.rules.java.JavaPluginInfoProvider.JavaPluginInfo; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @@ -339,7 +339,7 @@ } SpawnContinuation spawnContinuation = actionExecutionContext - .getContext(SpawnStrategy.class) + .getContext(SpawnStrategyResolver.class) .beginExecution(spawn, actionExecutionContext); return new JavaActionContinuation(actionExecutionContext, reducedClasspath, spawnContinuation); } @@ -604,7 +604,7 @@ } SpawnContinuation fallbackContinuation = actionExecutionContext - .getContext(SpawnStrategy.class) + .getContext(SpawnStrategyResolver.class) .beginExecution(spawn, actionExecutionContext); return new JavaFallbackActionContinuation( actionExecutionContext, results, fallbackContinuation);