Delete the FilesetActionContext and its Implementation
RELNOTES: None
PiperOrigin-RevId: 195428899
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 55594de..8139fbf 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -61,7 +61,6 @@
import com.google.devtools.build.lib.exec.CheckUpToDateFilter;
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.exec.ExecutorBuilder;
-import com.google.devtools.build.lib.exec.FilesetActionContextImpl;
import com.google.devtools.build.lib.exec.SingleBuildFileCache;
import com.google.devtools.build.lib.exec.SpawnActionContextMaps;
import com.google.devtools.build.lib.exec.SymlinkTreeStrategy;
@@ -69,7 +68,6 @@
import com.google.devtools.build.lib.profiler.ProfilePhase;
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.ProfilerTask;
-import com.google.devtools.build.lib.rules.fileset.FilesetActionContext;
import com.google.devtools.build.lib.runtime.BlazeModule;
import com.google.devtools.build.lib.runtime.BlazeRuntime;
import com.google.devtools.build.lib.runtime.CommandEnvironment;
@@ -136,7 +134,6 @@
for (BlazeModule module : runtime.getBlazeModules()) {
module.executorInit(env, request, builder);
}
- builder.addActionContextProvider(new FilesetActionContextImpl.Provider(env.getWorkspaceName()));
builder.addActionContext(new SymlinkTreeStrategy(
env.getOutputService(), env.getBlazeWorkspace().getBinTools()));
// TODO(philwo) - the ExecutionTool should not add arbitrary dependencies on its own, instead
@@ -145,7 +142,6 @@
builder.addActionContextConsumer(
b -> {
b.strategyByContextMap()
- .put(FilesetActionContext.class, "")
.put(WorkspaceStatusAction.Context.class, "")
.put(SymlinkTreeActionContext.class, "");
});
diff --git a/src/main/java/com/google/devtools/build/lib/exec/FilesetActionContextImpl.java b/src/main/java/com/google/devtools/build/lib/exec/FilesetActionContextImpl.java
deleted file mode 100644
index 6371352..0000000
--- a/src/main/java/com/google/devtools/build/lib/exec/FilesetActionContextImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2014 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.exec;
-
-import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.actions.ActionContext;
-import com.google.devtools.build.lib.actions.ExecutionStrategy;
-import com.google.devtools.build.lib.rules.fileset.FilesetActionContext;
-
-/**
- * Context for Fileset manifest actions. It currently only provides a ThreadPoolExecutor.
- *
- * <p>Fileset is a legacy, google-internal mechanism to make parts of the source tree appear as a
- * tree in the output directory.
- */
-@ExecutionStrategy(contextType = FilesetActionContext.class)
-public final class FilesetActionContextImpl implements FilesetActionContext {
- // TODO(bazel-team): it would be nice if this weren't shipped in Bazel at all.
-
- /**
- * Factory class.
- */
- public static class Provider extends ActionContextProvider {
- private FilesetActionContextImpl impl;
-
- public Provider(String workspaceName) {
- this.impl = new FilesetActionContextImpl(workspaceName);
- }
-
- @Override
- public Iterable<? extends ActionContext> getActionContexts() {
- return ImmutableList.of(impl);
- }
- }
-
- private final String workspaceName;
-
- private FilesetActionContextImpl(String workspaceName) {
- this.workspaceName = workspaceName;
- }
-
- @Override
- public String getWorkspaceName() {
- return workspaceName;
- }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContext.java b/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContext.java
deleted file mode 100644
index 76eb417..0000000
--- a/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContext.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 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.rules.fileset;
-
-import com.google.devtools.build.lib.actions.ActionContext;
-
-/**
- * Action context for fileset collection actions.
- */
-public interface FilesetActionContext extends ActionContext {
- /**
- * Returns the name of the workspace the build is run in.
- */
- String getWorkspaceName();
-}
