Remove `configGetter` parameter from `SymlinkDefinition#getLinkPaths`
it does not seem to be used by any of the function overrides
PiperOrigin-RevId: 789898861
Change-Id: Ibd3cd2bd1ae0ca4deefeddaaa86bdfff09fda45b
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/SymlinkDefinition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/SymlinkDefinition.java
index e85b46b..0c764b6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/SymlinkDefinition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/SymlinkDefinition.java
@@ -19,7 +19,6 @@
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.vfs.Path;
import java.util.Set;
-import java.util.function.Function;
/** Represents a single kind of convenience symlink ({@code bazel-bin}, etc.). */
public interface SymlinkDefinition {
@@ -43,9 +42,6 @@
* point to.
* @param targetConfigs the configurations for which symlinks should be created. If these have
* conflicting requirements, multiple candidates are returned.
- * @param configGetter used to compute derived configurations, if needed. This is used for
- * symlinks that link to the output directories of configs that are related to, but not
- * included in, {@code targetConfigs}.
* @param repositoryName the repository name.
* @param outputPath the output path.
* @param execRoot the exec root.
@@ -53,7 +49,6 @@
ImmutableSet<Path> getLinkPaths(
BuildRequestOptions buildRequestOptions,
Set<BuildConfigurationValue> targetConfigs,
- Function<BuildOptions, BuildConfigurationValue> configGetter,
RepositoryName repositoryName,
Path outputPath,
Path execRoot);
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ConfigSymlink.java b/src/main/java/com/google/devtools/build/lib/buildtool/ConfigSymlink.java
index b2d7b74..3ef4dd3 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ConfigSymlink.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ConfigSymlink.java
@@ -19,12 +19,10 @@
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.lib.actions.ArtifactRoot;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
-import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.SymlinkDefinition;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.vfs.Path;
import java.util.Set;
-import java.util.function.Function;
/** Base class for symlinks to output roots. Used only by {@link OutputDirectoryLinksUtils}. */
class ConfigSymlink implements SymlinkDefinition {
@@ -50,7 +48,6 @@
public ImmutableSet<Path> getLinkPaths(
BuildRequestOptions buildRequestOptions,
Set<BuildConfigurationValue> targetConfigs,
- Function<BuildOptions, BuildConfigurationValue> configGetter,
RepositoryName repositoryName,
Path outputPath,
Path execRoot) {
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 ee55c4c..dde02c1 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
@@ -52,7 +52,6 @@
import com.google.devtools.build.lib.analysis.WorkspaceStatusAction;
import com.google.devtools.build.lib.analysis.actions.SymlinkTreeActionContext;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
-import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.analysis.test.TestActionContext;
import com.google.devtools.build.lib.buildtool.BuildRequestOptions.ConvenienceSymlinksMode;
@@ -700,26 +699,6 @@
}
/**
- * Obtains the {@link BuildConfigurationValue} for a given {@link BuildOptions} for the purpose of
- * symlink creation.
- *
- * <p>In the event of a {@link InvalidConfigurationException}, a warning is emitted and null is
- * returned.
- */
- @Nullable
- private static BuildConfigurationValue getConfiguration(
- SkyframeExecutor executor, Reporter reporter, BuildOptions options) {
- try {
- return executor.getConfiguration(reporter, options, /* keepGoing= */ false);
- } catch (InvalidConfigurationException e) {
- reporter.handle(
- Event.warn(
- "Couldn't get configuration for convenience symlink creation: " + e.getMessage()));
- return null;
- }
- }
-
- /**
* Handles what action to perform on the convenience symlinks. If the mode is {@link
* ConvenienceSymlinksMode#IGNORE}, then skip any creating or cleaning of convenience symlinks.
* Otherwise, manage the convenience symlinks and then post a {@link
@@ -817,7 +796,6 @@
env.getDirectories(),
getReporter(),
targetConfigs,
- options -> getConfiguration(executor, reporter, options),
productName);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java b/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java
index 1c9f15b..a0a3033 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java
@@ -22,7 +22,6 @@
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
-import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.SymlinkDefinition;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.ConvenienceSymlink;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.ConvenienceSymlink.Action;
@@ -38,7 +37,6 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import java.util.function.Function;
/** Static utilities for managing output directory symlinks. */
public final class OutputDirectoryLinksUtils {
@@ -99,7 +97,6 @@
BlazeDirectories directories,
EventHandler eventHandler,
Set<BuildConfigurationValue> targetConfigs,
- Function<BuildOptions, BuildConfigurationValue> configGetter,
String productName) {
Path execRoot = directories.getExecRoot(workspaceName);
Path outputPath = directories.getOutputPath(workspaceName);
@@ -130,12 +127,7 @@
} else {
Set<Path> candidatePaths =
symlink.getLinkPaths(
- buildRequestOptions,
- targetConfigs,
- configGetter,
- repositoryName,
- outputPath,
- execRoot);
+ buildRequestOptions, targetConfigs, repositoryName, outputPath, execRoot);
if (candidatePaths.size() == 1) {
createLink(
workspace,
@@ -325,7 +317,6 @@
public ImmutableSet<Path> getLinkPaths(
BuildRequestOptions buildRequestOptions,
Set<BuildConfigurationValue> targetConfigs,
- Function<BuildOptions, BuildConfigurationValue> configGetter,
RepositoryName repositoryName,
Path outputPath,
Path execRoot) {
@@ -333,12 +324,7 @@
return ImmutableSet.of();
}
return super.getLinkPaths(
- buildRequestOptions,
- targetConfigs,
- configGetter,
- repositoryName,
- outputPath,
- execRoot);
+ buildRequestOptions, targetConfigs, repositoryName, outputPath, execRoot);
}
},
// output directory (bazel-out)
@@ -352,7 +338,6 @@
public ImmutableSet<Path> getLinkPaths(
BuildRequestOptions buildRequestOptions,
Set<BuildConfigurationValue> targetConfigs,
- Function<BuildOptions, BuildConfigurationValue> configGetter,
RepositoryName repositoryName,
Path outputPath,
Path execRoot) {
@@ -370,7 +355,6 @@
public ImmutableSet<Path> getLinkPaths(
BuildRequestOptions buildRequestOptions,
Set<BuildConfigurationValue> targetConfigs,
- Function<BuildOptions, BuildConfigurationValue> configGetter,
RepositoryName repositoryName,
Path outputPath,
Path execRoot) {
