Unify input prefetching

All prefetching now goes through AbstractSpawnStrategy's implementation of
SpawnExecutionPolicy. Make sure the sandbox runners also do this consistently.

PiperOrigin-RevId: 164836877

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java
index 27e147b701..f2f5e0f6fb 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/ActionContextProvider.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.exec;
 import com.google.devtools.build.lib.actions.ActionContext;
 import com.google.devtools.build.lib.actions.ActionGraph;
 import com.google.devtools.build.lib.actions.ActionInputFileCache;
-import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ExecutorInitException;
 
@@ -35,15 +34,13 @@ public abstract class ActionContextProvider {
   public abstract Iterable<? extends ActionContext> getActionContexts();
 
   /**
-   * Two-phase initialization. The input file cache and the input prefetcher usually come from a
-   * different module than the {@link ActionContextProvider} instances that require them, so this
-   * method is called after {@link com.google.devtools.build.lib.runtime.BlazeModule#executorInit}.
+   * Two-phase initialization. The input file cache usually comes from a different module than the
+   * {@link ActionContextProvider} instances that require it, so this method is called after
+   * {@link com.google.devtools.build.lib.runtime.BlazeModule#executorInit}.
    *
    * @param actionInputFileCache the input file cache
-   * @param actionInputPrefetcher the input file prefetcher
    */
-  public void init(
-      ActionInputFileCache actionInputFileCache, ActionInputPrefetcher actionInputPrefetcher) {
+  public void init(ActionInputFileCache actionInputFileCache) {
   }
 
   /**