From ace99b575fe1e43f7591b75cf5d1c867175f9980 Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 2 Nov 2022 15:06:30 -0700 Subject: [PATCH] Rename default_applicable_licenses to default_package_metadata. Leave default_applicable_licenses as an alias. Don't allow both to be set. Step 1 of https://docs.google.com/document/d/1uyJjkKbE8kV8EinakaR9q-Un25zCukhoH_dRBkWHSKQ/edit# PiperOrigin-RevId: 485705150 Change-Id: I5e0012e37e5bca55ed43f83dd9f26a26f78b543d --- .../lib/packages/DefaultPackageArguments.java | 63 ++++++++++++++----- .../devtools/build/lib/packages/Package.java | 22 +++---- .../build/lib/packages/RuleClass.java | 3 +- 3 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java b/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java index ae89e98788d517..a32f000ce70f26 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java +++ b/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java @@ -17,6 +17,7 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.License.DistributionType; +import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; import java.util.List; import java.util.Set; import net.starlark.java.eval.EvalException; @@ -30,15 +31,16 @@ private DefaultPackageArguments() {} /** Returns the default set of {@link PackageArgument}s. */ static ImmutableList> get() { return ImmutableList.of( - new DefaultDeprecation(), - new DefaultDistribs(), - new DefaultApplicableLicenses(), - new DefaultLicenses(), - new DefaultTestOnly(), - new DefaultVisibility(), - new Features(), - new DefaultCompatibleWith(), - new DefaultRestrictedTo()); + new DefaultDeprecation(), + new DefaultDistribs(), + new DefaultApplicableLicenses(), + new DefaultPackageMetadata(), + new DefaultLicenses(), + new DefaultTestOnly(), + new DefaultVisibility(), + new Features(), + new DefaultCompatibleWith(), + new DefaultRestrictedTo()); } private static class DefaultVisibility extends PackageArgument> { @@ -95,17 +97,48 @@ protected void process(Package.Builder pkgBuilder, Location location, * specified. */ private static class DefaultApplicableLicenses extends PackageArgument> { - private static final String DEFAULT_APPLICABLE_LICENSES_ATTRIBUTE = - "default_applicable_licenses"; - private DefaultApplicableLicenses() { - super(DEFAULT_APPLICABLE_LICENSES_ATTRIBUTE, BuildType.LABEL_LIST); + super("default_applicable_licenses", BuildType.LABEL_LIST); + } + + @Override + protected void process(Package.Builder pkgBuilder, Location location, List