diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java index 142f8136ae3817..d36c4d344750ad 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java @@ -971,22 +971,6 @@ private Builder addTargetIncludingFileTargets( return addTargetExceptFileTargets(target, mapping); } - /** Adds symlinks to given artifacts at their exec paths. */ - public Builder addSymlinksToArtifacts(NestedSet artifacts) { - // These are symlinks using the exec path, not the output-dir-relative path, which currently - // requires flattening. - return addSymlinksToArtifacts(artifacts.toList()); - } - - /** Adds symlinks to given artifacts at their exec paths. */ - @CanIgnoreReturnValue - public Builder addSymlinksToArtifacts(Iterable artifacts) { - for (Artifact artifact : artifacts) { - addSymlink(artifact.getExecPath(), artifact); - } - return this; - } - /** * Add extra middlemen artifacts that should be built by reverse dependency binaries. This * method exists solely to support the unfortunate legacy behavior of some rules; new uses @@ -999,11 +983,6 @@ public Builder addLegacyExtraMiddleman(Artifact middleman) { return this; } - /** Add the other {@link Runfiles} object transitively, but don't merge artifacts. */ - public Builder mergeExceptArtifacts(Runfiles runfiles) { - return merge(runfiles, false); - } - private static Iterable getNonDataDeps(RuleContext ruleContext) { return Iterables.concat( // TODO(bazel-team): This line shouldn't be here. Removing it requires that no rules have diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java index a9d0d075383bcf..c3c841d18ac340 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; import java.util.Collection; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -449,36 +448,6 @@ public static RunfilesSupport withExecutable( computeActionEnvironment(ruleContext)); } - /** - * Creates and returns a {@link RunfilesSupport} object for the given rule and executable. Note - * that this method calls back into the passed in rule to obtain the runfiles. - */ - public static RunfilesSupport withExecutable( - RuleContext ruleContext, Runfiles runfiles, Artifact executable, List appendingArgs) - throws InterruptedException { - return RunfilesSupport.create( - ruleContext, - executable, - runfiles, - computeArgs(ruleContext, CommandLine.of(appendingArgs)), - computeActionEnvironment(ruleContext)); - } - - /** - * Creates and returns a {@link RunfilesSupport} object for the given rule, executable, runfiles - * and args. - */ - public static RunfilesSupport withExecutable( - RuleContext ruleContext, Runfiles runfiles, Artifact executable, CommandLine appendingArgs) - throws InterruptedException { - return RunfilesSupport.create( - ruleContext, - executable, - runfiles, - computeArgs(ruleContext, appendingArgs), - computeActionEnvironment(ruleContext)); - } - private static CommandLine computeArgs(RuleContext ruleContext, CommandLine additionalArgs) throws InterruptedException { if (!ruleContext.getRule().isAttrDefined("args", Type.STRING_LIST)) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java index 05bc361268118b..02c40d8f765d04 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetAndConfiguration.java @@ -35,13 +35,6 @@ public TargetAndConfiguration(Target target, @Nullable BuildConfigurationValue c this.configuration = configuration; } - // The node name in the graph. The name should be unique. - // It is not suitable for user display. - public String getName() { - return target.getLabel() + " " - + (configuration == null ? "null" : configuration.checksum()); - } - @Override public boolean equals(Object that) { if (this == that) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java index 4d1c7936e595d5..66104094b3fa67 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.skyframe.BuildConfigurationKey; import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import java.util.List; import java.util.Optional; @@ -105,10 +104,6 @@ public BuildConfigurationValue getConfiguration() { return configuration; } - public BuildConfigurationKey getConfigurationKey() { - return configuration.getKey(); - } - public NestedSet getVisibility() { return visibility; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java index 4ac5689ea8178a..b7d098d869a3fe 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java @@ -18,7 +18,6 @@ import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.Provider; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import java.util.Arrays; import java.util.LinkedHashMap; import javax.annotation.Nullable; @@ -88,10 +87,6 @@ public TransitiveInfoProviderMapBuilder add(TransitiveInfoProvider provider) { return put(TransitiveInfoProviderEffectiveClassHelper.get(provider), provider); } - public TransitiveInfoProviderMapBuilder add(TransitiveInfoProvider... providers) { - return addAll(Arrays.asList(providers)); - } - @CanIgnoreReturnValue public TransitiveInfoProviderMapBuilder addAll(TransitiveInfoProviderMap other) { for (int i = 0; i < other.getProviderCount(); ++i) { @@ -100,14 +95,6 @@ public TransitiveInfoProviderMapBuilder addAll(TransitiveInfoProviderMap other) return this; } - @CanIgnoreReturnValue - public TransitiveInfoProviderMapBuilder addAll(Iterable providers) { - for (TransitiveInfoProvider provider : providers) { - add(provider); - } - return this; - } - @Nullable public

P getProvider(Class

providerClass) { return providerClass.cast(providers.get(providerClass));