Split the include scanning dummy classes into their own parent class PiperOrigin-RevId: 185140903
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/DummyIncludeScanningContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/DummyIncludeScanningContextProvider.java new file mode 100644 index 0000000..2c92f75 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/standalone/DummyIncludeScanningContextProvider.java
@@ -0,0 +1,88 @@ +// Copyright 2018 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +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.exec.ActionContextProvider; +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.runtime.CommandEnvironment; +import com.google.devtools.build.lib.vfs.FileSystemUtils; +import java.io.IOException; +import javax.annotation.Nullable; + +/** + * Provide a standalone, local execution context. + */ +public class DummyIncludeScanningContextProvider 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(); + } + } + + /** A CppIncludeScanningContext that does nothing. */ + @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 DummyIncludeScanningContextProvider(CommandEnvironment env) { + this.env = env; + } + + @Override + public Iterable<? extends ActionContext> getActionContexts() { + return ImmutableList.of( + new DummyCppIncludeExtractionContext(), + new DummyCppIncludeScanningContext()); + } +}
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 0c0775b..efdf7e5 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.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 @@ // 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),
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneModule.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneModule.java index 6f299fa..ead6811 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneModule.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneModule.java
@@ -25,6 +25,7 @@ @Override public void executorInit(CommandEnvironment env, BuildRequest request, ExecutorBuilder builder) { builder.addActionContextProvider(new StandaloneActionContextProvider(env)); + builder.addActionContextProvider(new DummyIncludeScanningContextProvider(env)); builder.addActionContextConsumer(new StandaloneActionContextConsumer()); } }