Update FakeCppCompileAction to use SpawnStrategyResolver. Part of the roll-forward of https://github.com/bazelbuild/bazel/commit/37aeabcd39fe326d1c4e55693d8d207f9f7ac6c4. PiperOrigin-RevId: 307023722
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java index 27ab7c5..f5e72eb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
@@ -33,11 +33,11 @@ import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnResult; -import com.google.devtools.build.lib.actions.SpawnStrategy; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible; import com.google.devtools.build.lib.events.Event; +import com.google.devtools.build.lib.exec.SpawnStrategyResolver; import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions; import com.google.devtools.build.lib.rules.cpp.CcCommon.CoptsFilter; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; @@ -138,8 +138,9 @@ byte[] dotDContents = null; try { Spawn spawn = createSpawn(actionExecutionContext.getClientEnv()); - SpawnStrategy strategy = actionExecutionContext.getContext(SpawnStrategy.class); - spawnResults = strategy.exec(spawn, actionExecutionContext); + SpawnStrategyResolver spawnStrategyResolver = + actionExecutionContext.getContext(SpawnStrategyResolver.class); + spawnResults = spawnStrategyResolver.exec(spawn, actionExecutionContext); // The SpawnActionContext guarantees that the first list entry is the successful one. dotDContents = getDotDContents(spawnResults.get(0)); } catch (ExecException e) {