commit 2b7e21db100bdc0bd319f37106ed3d9e7c8dbe74
author michajlo <michajlo@google.com> Wed Nov 20 09:55:24 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 20 09:58:06 2019 -0800
tree acb755931736a738261fd885dda0056887f9969e
parent 341ecd78051363be682eab3d41bdca1300583167

Move Package#DEFAULT_{COMPATIBLE_WITH,RESTRICTED_TO}_ATTRIBUTE} to only use

No need to have them so far from where they're actually used. This removes some
clutter and ensures they're not abandoned if their only usage gets deleted.

PiperOrigin-RevId: 281541500

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 9d6e6a4..34644e5 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
@@ -201,14 +201,6 @@
    */
   private ImmutableMap<RepositoryName, RepositoryName> repositoryMapping;
 
-  /**
-   * The names of the package() attributes that declare default values for rule
-   * {@link RuleClass#COMPATIBLE_ENVIRONMENT_ATTR} and {@link RuleClass#RESTRICTED_ENVIRONMENT_ATTR}
-   * values when not explicitly specified.
-   */
-  public static final String DEFAULT_COMPATIBLE_WITH_ATTRIBUTE = "default_compatible_with";
-  public static final String DEFAULT_RESTRICTED_TO_ATTRIBUTE = "default_restricted_to";
-
   private Set<Label> defaultCompatibleWith = ImmutableSet.of();
   private Set<Label> defaultRestrictedTo = ImmutableSet.of();
 

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

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index bf622a0..b03467e 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -231,15 +231,16 @@
    * explicitly specified.
    */
   private static class DefaultCompatibleWith extends PackageArgument<List<Label>> {
+    private static final String DEFAULT_COMPATIBLE_WITH_ATTRIBUTE = "default_compatible_with";
+
     private DefaultCompatibleWith() {
-      super(Package.DEFAULT_COMPATIBLE_WITH_ATTRIBUTE, BuildType.LABEL_LIST);
+      super(DEFAULT_COMPATIBLE_WITH_ATTRIBUTE, BuildType.LABEL_LIST);
     }
 
     @Override
     protected void process(Package.Builder pkgBuilder, Location location,
         List<Label> value) {
-      pkgBuilder.setDefaultCompatibleWith(value, Package.DEFAULT_COMPATIBLE_WITH_ATTRIBUTE,
-          location);
+      pkgBuilder.setDefaultCompatibleWith(value, DEFAULT_COMPATIBLE_WITH_ATTRIBUTE, location);
     }
   }
 
@@ -249,14 +250,16 @@
    * explicitly specified.
    */
   private static class DefaultRestrictedTo extends PackageArgument<List<Label>> {
+    private static final String DEFAULT_RESTRICTED_TO_ATTRIBUTE = "default_restricted_to";
+
     private DefaultRestrictedTo() {
-      super(Package.DEFAULT_RESTRICTED_TO_ATTRIBUTE, BuildType.LABEL_LIST);
+      super(DEFAULT_RESTRICTED_TO_ATTRIBUTE, BuildType.LABEL_LIST);
     }
 
     @Override
     protected void process(Package.Builder pkgBuilder, Location location,
         List<Label> value) {
-      pkgBuilder.setDefaultRestrictedTo(value, Package.DEFAULT_RESTRICTED_TO_ATTRIBUTE, location);
+      pkgBuilder.setDefaultRestrictedTo(value, DEFAULT_RESTRICTED_TO_ATTRIBUTE, location);
     }
   }