Remove some unused code.
RELNOTES: None.
PiperOrigin-RevId: 235901787
diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java b/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java
index 3cf9cac..305d06c 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java
@@ -19,7 +19,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.MoreExecutors;
-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.ActionExecutionMetadata;
@@ -37,7 +36,6 @@
import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadHostile;
import com.google.devtools.build.lib.exec.ActionContextProvider;
import com.google.devtools.build.lib.exec.ExecutorBuilder;
-import com.google.devtools.build.lib.includescanning.IncludeParser.GrepIncludesFileType;
import com.google.devtools.build.lib.includescanning.IncludeParser.Inclusion;
import com.google.devtools.build.lib.rules.cpp.CppIncludeExtractionContext;
import com.google.devtools.build.lib.rules.cpp.CppIncludeScanningContext;
@@ -137,26 +135,6 @@
public ArtifactResolver getArtifactResolver() {
return env.getSkyframeBuildView().getArtifactFactory();
}
-
- @Override
- public void extractIncludes(
- ActionExecutionContext actionExecutionContext,
- Action resourceOwner,
- Artifact primaryInput,
- Artifact primaryOutput,
- Artifact grepIncludes)
- throws ExecException, InterruptedException {
- SpawnIncludeScanner.spawnGrep(
- primaryInput,
- primaryOutput.getExecPath(),
- // We must actually write the .includes files to disk here because they are Artifacts in
- // the action graph.
- /*inMemoryOutput=*/ false,
- resourceOwner,
- actionExecutionContext,
- grepIncludes,
- GrepIncludesFileType.CPP);
- }
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppIncludeExtractionContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppIncludeExtractionContext.java
index 400fdb9..f47b5b1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppIncludeExtractionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppIncludeExtractionContext.java
@@ -13,36 +13,11 @@
// limitations under the License.
package com.google.devtools.build.lib.rules.cpp;
-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.Artifact;
import com.google.devtools.build.lib.actions.ArtifactResolver;
-import com.google.devtools.build.lib.actions.ExecException;
-import java.io.IOException;
-/**
- * Context for actions that do include scanning.
- */
+/** Context for actions that do include scanning. */
public interface CppIncludeExtractionContext extends ActionContext {
- /**
- * Extracts the set of include files from a source file.
- *
- * @param actionExecutionContext the execution context
- * @param resourceOwner the resource owner
- * @param primaryInput the source file to be include scanned
- * @param primaryOutput the output file where the results should be put
- */
- void extractIncludes(
- ActionExecutionContext actionExecutionContext,
- Action resourceOwner,
- Artifact primaryInput,
- Artifact primaryOutput,
- Artifact grepIncludes)
- throws IOException, ExecException, InterruptedException;
-
- /**
- * Returns the artifact resolver.
- */
+ /** Returns the artifact resolver. */
ArtifactResolver getArtifactResolver();
}
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeExtractionContext.java b/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeExtractionContext.java
index f8a6000..31d931b 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeExtractionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeExtractionContext.java
@@ -13,15 +13,10 @@
// limitations under the License.
package com.google.devtools.build.lib.standalone;
-import com.google.devtools.build.lib.actions.Action;
-import com.google.devtools.build.lib.actions.ActionExecutionContext;
-import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ArtifactResolver;
import com.google.devtools.build.lib.actions.ExecutionStrategy;
import com.google.devtools.build.lib.rules.cpp.CppIncludeExtractionContext;
import com.google.devtools.build.lib.runtime.CommandEnvironment;
-import com.google.devtools.build.lib.vfs.FileSystemUtils;
-import java.io.IOException;
/**
* An IncludeExtractionContext that does nothing. Since local execution does not need to discover
@@ -36,18 +31,6 @@
}
@Override
- public void extractIncludes(
- ActionExecutionContext actionExecutionContext,
- Action resourceOwner,
- Artifact primaryInput,
- Artifact primaryOutput,
- Artifact grepIncludes)
- throws IOException {
- FileSystemUtils.writeContent(
- actionExecutionContext.getInputPath(primaryOutput), new byte[] {});
- }
-
- @Override
public ArtifactResolver getArtifactResolver() {
return env.getSkyframeBuildView().getArtifactFactory();
}
