Skip to content

Commit f1ae4b8

Browse files
aiutocopybara-github
authored andcommitted
Remove declarations of the getDistributions() function.
It is not called any more. RELNOTES: N/A PiperOrigin-RevId: 741721243 Change-Id: Idc72bf526ae1384d5c29d3055fecbccbc7fc5c48
1 parent 5a7e63a commit f1ae4b8

File tree

7 files changed

+0
-51
lines changed

7 files changed

+0
-51
lines changed

src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.google.devtools.build.lib.events.Event;
2929
import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code;
3030
import java.util.ArrayList;
31-
import java.util.Collections;
3231
import java.util.HashMap;
3332
import java.util.List;
3433
import java.util.Map;
@@ -303,11 +302,6 @@ public String toString() {
303302
return targetKind() + " " + getLabel();
304303
}
305304

306-
@Override
307-
public Set<License.DistributionType> getDistributions() {
308-
return Collections.emptySet();
309-
}
310-
311305
@Override
312306
@Nullable
313307
public RuleVisibility getRawVisibility() {

src/main/java/com/google/devtools/build/lib/packages/FileTarget.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
import com.google.common.base.Preconditions;
1818
import com.google.devtools.build.lib.cmdline.Label;
1919
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
20-
import com.google.devtools.build.lib.packages.License.DistributionType;
2120
import com.google.devtools.build.lib.util.FileType;
22-
import java.util.Set;
2321

2422
/**
2523
* Common superclass for InputFile and OutputFile which provides implementation for the file
@@ -60,11 +58,6 @@ public String toString() {
6058
return getTargetKind() + "(" + label + ")"; // Just for debugging
6159
}
6260

63-
@Override
64-
public Set<DistributionType> getDistributions() {
65-
return License.DEFAULT_DISTRIB;
66-
}
67-
6861
/**
6962
* {@inheritDoc}
7063
*

src/main/java/com/google/devtools/build/lib/packages/PackageGroup.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,10 @@
1919
import com.google.devtools.build.lib.cmdline.Label;
2020
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
2121
import com.google.devtools.build.lib.events.EventHandler;
22-
import com.google.devtools.build.lib.packages.License.DistributionType;
2322
import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
2423
import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code;
2524
import java.util.Collection;
26-
import java.util.Collections;
2725
import java.util.List;
28-
import java.util.Set;
2926
import javax.annotation.Nullable;
3027
import net.starlark.java.syntax.Location;
3128

@@ -108,11 +105,6 @@ public Rule getAssociatedRule() {
108105
return null;
109106
}
110107

111-
@Override
112-
public Set<DistributionType> getDistributions() {
113-
return Collections.emptySet();
114-
}
115-
116108
@Override
117109
public Label getLabel() {
118110
return label;

src/main/java/com/google/devtools/build/lib/packages/Rule.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import com.google.devtools.build.lib.events.EventHandler;
4141
import com.google.devtools.build.lib.events.NullEventHandler;
4242
import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.StarlarkImplicitOutputsFunction;
43-
import com.google.devtools.build.lib.packages.License.DistributionType;
4443
import com.google.devtools.build.lib.packages.Package.ConfigSettingVisibilityPolicy;
4544
import com.google.devtools.build.lib.server.FailureDetails.PackageLoading;
4645
import com.google.devtools.build.lib.skyframe.serialization.VisibleForSerialization;
@@ -718,16 +717,6 @@ public boolean isConfigurable() {
718717
return true;
719718
}
720719

721-
@Override
722-
public Set<DistributionType> getDistributions() {
723-
if (isAttrDefined("distribs", BuildType.DISTRIBUTIONS)
724-
&& isAttributeValueExplicitlySpecified("distribs")) {
725-
return NonconfigurableAttributeMapper.of(this).get("distribs", BuildType.DISTRIBUTIONS);
726-
} else {
727-
return License.DEFAULT_DISTRIB;
728-
}
729-
}
730-
731720
@Override
732721
public License getLicense() {
733722
// New style licenses defined by Starlark rules don't

src/main/java/com/google/devtools/build/lib/packages/Target.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
import com.google.devtools.build.lib.cmdline.Label;
1818
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
19-
import com.google.devtools.build.lib.packages.License.DistributionType;
2019
import java.util.List;
21-
import java.util.Set;
2220
import javax.annotation.Nullable;
2321

2422
/**
@@ -102,9 +100,6 @@ default boolean isCreatedInSymbolicMacro() {
102100
*/
103101
License getLicense();
104102

105-
/** Returns the set of distribution types associated with this target. */
106-
Set<DistributionType> getDistributions();
107-
108103
/**
109104
* Returns the visibility that was supplied at the point of this target's declaration -- e.g. the
110105
* {@code visibility} attribute/argument for a rule target or {@code exports_files()} declaration)

src/main/java/com/google/devtools/build/lib/query2/compat/FakeLoadTarget.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package com.google.devtools.build.lib.query2.compat;
1515

1616
import com.google.common.base.Preconditions;
17-
import com.google.common.collect.ImmutableSet;
1817
import com.google.devtools.build.lib.cmdline.Label;
1918
import com.google.devtools.build.lib.packages.License;
2019
import com.google.devtools.build.lib.packages.Package;
@@ -24,7 +23,6 @@
2423
import com.google.devtools.build.lib.packages.Target;
2524
import com.google.devtools.build.lib.packages.TargetData;
2625
import java.util.Objects;
27-
import java.util.Set;
2826
import net.starlark.java.syntax.Location;
2927

3028
/**
@@ -81,11 +79,6 @@ public Location getLocation() {
8179
return getPackageDeclarations().getBuildFile().getLocation();
8280
}
8381

84-
@Override
85-
public Set<License.DistributionType> getDistributions() {
86-
return ImmutableSet.of();
87-
}
88-
8982
@Override
9083
public RuleVisibility getRawVisibility() {
9184
return RuleVisibility.PUBLIC;

src/test/java/com/google/devtools/build/lib/graph/DigraphTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.common.collect.Lists;
2222
import com.google.devtools.build.lib.cmdline.Label;
2323
import com.google.devtools.build.lib.packages.License;
24-
import com.google.devtools.build.lib.packages.License.DistributionType;
2524
import com.google.devtools.build.lib.packages.Package;
2625
import com.google.devtools.build.lib.packages.Packageoid;
2726
import com.google.devtools.build.lib.packages.Rule;
@@ -30,7 +29,6 @@
3029
import com.google.devtools.build.lib.packages.TargetData;
3130
import java.util.Comparator;
3231
import java.util.List;
33-
import java.util.Set;
3432
import net.starlark.java.syntax.Location;
3533
import org.junit.Test;
3634
import org.junit.runner.RunWith;
@@ -90,11 +88,6 @@ public Location getLocation() {
9088
return null;
9189
}
9290

93-
@Override
94-
public Set<DistributionType> getDistributions() {
95-
return null;
96-
}
97-
9891
@Override
9992
public RuleVisibility getRawVisibility() {
10093
return null;

0 commit comments

Comments
 (0)