commit 025d80af33bb6b519037721fddf45f92ba99e2ee
author Googler <nharmata@google.com> Fri May 26 07:15:09 2023 -0700
committer fweikert <fwe@google.com> Mon Jun 05 14:01:26 2023 +0200
tree 95a5d7bacf95c1c20d43bc03ab831460df019ad0
parent ea2d5043113a34ce341c53168141f13f14053240

Have `Package#defaultPackageMetadata` be in the same order that the `package.default_applicable_licenses` list was in.

Afaict, the order doesn't actually matter, so there's no point in sorting (in `Package#finishInit)`.

PiperOrigin-RevId: 535609913
Change-Id: I804c0b40bae67640e69157933d9271811e24dd14

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

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 892cfcc..da4a123 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -234,7 +233,7 @@
   @Nullable private FailureDetail failureDetail;
 
   /** The package's default "package_metadata" attribute. */
-  private ImmutableSet<Label> defaultPackageMetadata = ImmutableSet.of();
+  private ImmutableList<Label> defaultPackageMetadata = ImmutableList.of();
 
   /**
    * The package's default "licenses" and "distribs" attributes, as specified
@@ -479,7 +478,7 @@
     this.failureDetail = builder.getFailureDetail();
     this.defaultLicense = builder.defaultLicense;
     this.defaultDistributionSet = builder.defaultDistributionSet;
-    this.defaultPackageMetadata = ImmutableSortedSet.copyOf(builder.defaultPackageMetadata);
+    this.defaultPackageMetadata = builder.defaultPackageMetadata;
     this.features = builder.features;
     this.registeredExecutionPlatforms = ImmutableList.copyOf(builder.registeredExecutionPlatforms);
     this.registeredToolchains = ImmutableList.copyOf(builder.registeredToolchains);
@@ -870,7 +869,7 @@
   }
 
   /** Gets the package metadata list for the default metadata declared by this package. */
-  Set<Label> getDefaultPackageMetadata() {
+  ImmutableList<Label> getDefaultPackageMetadata() {
     return defaultPackageMetadata;
   }