Move DummyCppInclude{Extraction,Scanning}Context to top-level classes
Reduce usage of ActionContextProvider.
PiperOrigin-RevId: 220236944
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
new file mode 100644
index 0000000..f8a6000
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeExtractionContext.java
@@ -0,0 +1,54 @@
+// 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.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
+ * inclusion in advance, we do not need include scanning.
+ */
+@ExecutionStrategy(contextType = CppIncludeExtractionContext.class)
+class DummyCppIncludeExtractionContext implements CppIncludeExtractionContext {
+ private final CommandEnvironment env;
+
+ public DummyCppIncludeExtractionContext(CommandEnvironment env) {
+ this.env = env;
+ }
+
+ @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();
+ }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeScanningContext.java b/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeScanningContext.java
new file mode 100644
index 0000000..924ce27
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/standalone/DummyCppIncludeScanningContext.java
@@ -0,0 +1,38 @@
+// 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.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.ExecException;
+import com.google.devtools.build.lib.actions.ExecutionStrategy;
+import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
+import com.google.devtools.build.lib.rules.cpp.CppIncludeScanningContext;
+import com.google.devtools.build.lib.rules.cpp.IncludeProcessing;
+import javax.annotation.Nullable;
+
+/** A CppIncludeScanningContext that does nothing. */
+@ExecutionStrategy(contextType = CppIncludeScanningContext.class)
+class DummyCppIncludeScanningContext implements CppIncludeScanningContext {
+ @Override
+ @Nullable
+ public Iterable<Artifact> findAdditionalInputs(
+ CppCompileAction action,
+ ActionExecutionContext actionExecutionContext,
+ IncludeProcessing includeProcessing)
+ throws ExecException, InterruptedException, ActionExecutionException {
+ return null;
+ }
+}
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
deleted file mode 100644
index f42903a..0000000
--- a/src/main/java/com/google/devtools/build/lib/standalone/DummyIncludeScanningContextProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// 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,
- Artifact grepIncludes)
- throws IOException {
- FileSystemUtils.writeContent(
- actionExecutionContext.getInputPath(primaryOutput), 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/StandaloneModule.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneModule.java
index 4c8631d..1393c20 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
@@ -44,7 +44,8 @@
@Override
public void executorInit(CommandEnvironment env, BuildRequest request, ExecutorBuilder builder) {
// TODO(ulfjack): Move this to another module.
- builder.addActionContextProvider(new DummyIncludeScanningContextProvider(env));
+ builder.addActionContext(new DummyCppIncludeExtractionContext(env));
+ builder.addActionContext(new DummyCppIncludeScanningContext());
ExecutionOptions executionOptions = env.getOptions().getOptions(ExecutionOptions.class);
Path testTmpRoot =
