Split the include scanning dummy classes into their own parent class

PiperOrigin-RevId: 185140903

1 files changed, 0 insertions, 56 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
index 0c0775b8da..efdf7e52be 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
@@ -14,14 +14,7 @@
 package com.google.devtools.build.lib.standalone;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.ActionContext;
-import com.google.devtools.build.lib.actions.ActionExecutionContext;
-import com.google.devtools.build.lib.actions.ActionExecutionException;
-import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.ArtifactResolver;
-import com.google.devtools.build.lib.actions.ExecException;
-import com.google.devtools.build.lib.actions.ExecutionStrategy;
 import com.google.devtools.build.lib.actions.ResourceManager;
 import com.google.devtools.build.lib.analysis.test.TestActionContext;
 import com.google.devtools.build.lib.exec.ActionContextProvider;
@@ -36,63 +29,16 @@ import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
 import com.google.devtools.build.lib.exec.local.LocalSpawnRunner;
 import com.google.devtools.build.lib.exec.local.PosixLocalEnvProvider;
 import com.google.devtools.build.lib.exec.local.WindowsLocalEnvProvider;
-import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
-import com.google.devtools.build.lib.rules.cpp.CppIncludeExtractionContext;
-import com.google.devtools.build.lib.rules.cpp.CppIncludeScanningContext;
-import com.google.devtools.build.lib.rules.cpp.IncludeProcessing;
 import com.google.devtools.build.lib.rules.cpp.SpawnGccStrategy;
 import com.google.devtools.build.lib.rules.test.ExclusiveTestStrategy;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.util.OS;
-import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
-import java.io.IOException;
-import javax.annotation.Nullable;
 
 /**
  * Provide a standalone, local execution context.
  */
 public class StandaloneActionContextProvider extends ActionContextProvider {
-
-  /**
-   * An IncludeExtractionContext that does nothing. Since local execution does not need to discover
-   * inclusion in advance, we do not need include scanning.
-   */
-  @ExecutionStrategy(contextType = CppIncludeExtractionContext.class)
-  class DummyCppIncludeExtractionContext implements CppIncludeExtractionContext {
-    @Override
-    public void extractIncludes(
-        ActionExecutionContext actionExecutionContext,
-        Action resourceOwner,
-        Artifact primaryInput,
-        Artifact primaryOutput)
-        throws IOException {
-      FileSystemUtils.writeContent(primaryOutput.getPath(), new byte[]{});
-    }
-
-    @Override
-    public ArtifactResolver getArtifactResolver() {
-      return env.getSkyframeBuildView().getArtifactFactory();
-    }
-  }
-
-  /**
-   * An IncludeScanningContext that does nothing. Since local execution does not need to discover
-   * inclusion in advance, we do not need include scanning.
-   */
-  @ExecutionStrategy(contextType = CppIncludeScanningContext.class)
-  static class DummyCppIncludeScanningContext implements CppIncludeScanningContext {
-    @Override
-    @Nullable
-    public Iterable<Artifact> findAdditionalInputs(
-        CppCompileAction action,
-        ActionExecutionContext actionExecutionContext,
-        IncludeProcessing includeProcessing)
-        throws ExecException, InterruptedException, ActionExecutionException {
-      return null;
-    }
-  }
-
   private final CommandEnvironment env;
 
   public StandaloneActionContextProvider(CommandEnvironment env) {
@@ -115,8 +61,6 @@ public class StandaloneActionContextProvider extends ActionContextProvider {
     // last one from strategies list will be used
     return ImmutableList.of(
         new StandaloneSpawnStrategy(env.getExecRoot(), createLocalRunner(env)),
-        new DummyCppIncludeExtractionContext(),
-        new DummyCppIncludeScanningContext(),
         new SpawnGccStrategy(),
         testStrategy,
         new ExclusiveTestStrategy(testStrategy),