commit b866a8c390b8bc86ae9129b89ec38f94bd8ceb16
author jcater <jcater@google.com> Fri Apr 17 04:55:41 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 17 04:56:57 2020 -0700
tree 13486aa13a1c5a4afe97b3d1c6eaf5978570dbc1
parent bfa6596e6be40258962584818b6148e6f7750070

Update SpawnIncludeScanner to use SpawnStrategyResolver.

Part of the roll-forward of https://github.com/bazelbuild/bazel/commit/37aeabcd39fe326d1c4e55693d8d207f9f7ac6c4.

PiperOrigin-RevId: 307023285

src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java

diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java b/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java
index c666498..063c534 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/SpawnIncludeScanner.java
@@ -41,11 +41,11 @@
 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.analysis.platform.PlatformInfo;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
+import com.google.devtools.build.lib.exec.SpawnStrategyResolver;
 import com.google.devtools.build.lib.includescanning.IncludeParser.GrepIncludesFileType;
 import com.google.devtools.build.lib.includescanning.IncludeParser.Inclusion;
 import com.google.devtools.build.lib.util.io.FileOutErr;
@@ -375,11 +375,12 @@
     // Don't share the originalOutErr across spawnGrep calls. Doing so would not be thread-safe.
     FileOutErr originalOutErr = actionExecutionContext.getFileOutErr();
     FileOutErr grepOutErr = originalOutErr.childOutErr();
-    SpawnStrategy strategy = actionExecutionContext.getContext(SpawnStrategy.class);
+    SpawnStrategyResolver spawnStrategyResolver =
+        actionExecutionContext.getContext(SpawnStrategyResolver.class);
     ActionExecutionContext spawnContext = actionExecutionContext.withFileOutErr(grepOutErr);
     List<SpawnResult> results;
     try {
-      results = strategy.exec(spawn, spawnContext);
+      results = spawnStrategyResolver.exec(spawn, spawnContext);
       dump(spawnContext, actionExecutionContext);
     } catch (ExecException e) {
       dump(spawnContext, actionExecutionContext);
@@ -501,7 +502,7 @@
     SpawnContinuation spawnContinuation;
     try {
       spawnContinuation =
-          grepContext.getContext(SpawnStrategy.class).beginExecution(spawn, grepContext);
+          grepContext.getContext(SpawnStrategyResolver.class).beginExecution(spawn, grepContext);
     } catch (InterruptedException e) {
       dump(grepContext, actionExecutionContext);
       return Futures.immediateCancelledFuture();