Remove "obsolete" and "default_obsolete" from the BUILD language.

Anyone who needs this kind of functionality in the future can redefine
it through user-defined constraints.

--
MOS_MIGRATED_REVID=88871811

13 files changed, 9 insertions, 86 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index ad5756ecba..a14cd5391d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -57,14 +57,6 @@ public class BaseRuleClasses {
   private static final Label COVERAGE_SUPPORT_LABEL =
       Label.parseAbsoluteUnchecked("//tools/defaults:coverage");
 
-  private static final Attribute.ComputedDefault obsoleteDefault =
-      new Attribute.ComputedDefault() {
-        @Override
-        public Object getDefault(AttributeMap rule) {
-          return rule.getPackageDefaultObsolete();
-        }
-      };
-
   private static final Attribute.ComputedDefault testonlyDefault =
       new Attribute.ComputedDefault() {
         @Override
@@ -239,8 +231,6 @@ public class BaseRuleClasses {
               .nonconfigurable("Used in core loading phase logic with no access to configs"))
           .add(attr("distribs", DISTRIBUTIONS)
               .nonconfigurable("Used in core loading phase logic with no access to configs"))
-          .add(attr("obsolete", BOOLEAN).value(obsoleteDefault)
-              .nonconfigurable("Used in core loading phase logic with no access to configs"))
           .add(attr(":action_listener", LABEL_LIST).cfg(HOST).value(ACTION_LISTENER))
           .build();
     }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AbstractAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/AbstractAttributeMapper.java
index c13c362b28..6ae21d9a1d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AbstractAttributeMapper.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AbstractAttributeMapper.java
@@ -110,11 +110,6 @@ public abstract class AbstractAttributeMapper implements AttributeMap {
   }
 
   @Override
-  public Boolean getPackageDefaultObsolete() {
-    return pkg.getDefaultObsolete();
-  }
-
-  @Override
   public Boolean getPackageDefaultTestOnly() {
     return pkg.getDefaultTestOnly();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java
index def32b58bb..682d2dd698 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java
@@ -196,8 +196,6 @@ public class AggregatingAttributeMapper extends AbstractAttributeMapper {
       @Override
       public String getPackageDefaultHdrsCheck() { return owner.getPackageDefaultHdrsCheck(); }
       @Override
-      public Boolean getPackageDefaultObsolete() { return owner.getPackageDefaultObsolete(); }
-      @Override
       public Boolean getPackageDefaultTestOnly() { return owner.getPackageDefaultTestOnly(); }
       @Override
       public String getPackageDefaultDeprecation() { return owner.getPackageDefaultDeprecation(); }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeMap.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeMap.java
index 52aecd1655..131ed05972 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AttributeMap.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AttributeMap.java
@@ -98,8 +98,6 @@ public interface AttributeMap {
   // a more generic interface.
   String getPackageDefaultHdrsCheck();
 
-  Boolean getPackageDefaultObsolete();
-
   Boolean getPackageDefaultTestOnly();
 
   String getPackageDefaultDeprecation();
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 b909dd8604..fc2b379263 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
@@ -133,11 +133,6 @@ public class Package implements Serializable {
   private boolean defaultVisibilitySet;
 
   /**
-   * Default package-level 'obsolete' value for rules that do not specify it.
-   */
-  private boolean defaultObsolete = false;
-
-  /**
    * Default package-level 'testonly' value for rules that do not specify it.
    */
   private boolean defaultTestOnly = false;
@@ -288,13 +283,6 @@ public class Package implements Serializable {
   }
 
   /**
-   * Set the default 'obsolete' value for this package.
-   */
-  protected void setDefaultObsolete(boolean obsolete) {
-    defaultObsolete = obsolete;
-  }
-
-  /**
    * Set the default 'testonly' value for this package.
    */
   protected void setDefaultTestOnly(boolean testOnly) {
@@ -646,13 +634,6 @@ public class Package implements Serializable {
   }
 
   /**
-   * Returns the default obsolete value.
-   */
-  public Boolean getDefaultObsolete() {
-    return defaultObsolete;
-  }
-
-  /**
    * Returns the default testonly value.
    */
   public Boolean getDefaultTestOnly() {
@@ -660,7 +641,7 @@ public class Package implements Serializable {
   }
 
   /**
-   * Returns the default obsolete value.
+   * Returns the default deprecation value.
    */
   public String getDefaultDeprecation() {
     return defaultDeprecation;
@@ -946,14 +927,6 @@ public class Package implements Serializable {
       return self();
     }
 
-    /**
-     * Sets the default value of 'obsolete'. Rule-level 'obsolete' will override this.
-     */
-    B setDefaultObsolete(boolean defaultObsolete) {
-      pkg.setDefaultObsolete(defaultObsolete);
-      return self();
-    }
-
     /** Sets the default value of 'testonly'. Rule-level 'testonly' will override this. */
     B setDefaultTestonly(boolean defaultTestonly) {
       pkg.setDefaultTestOnly(defaultTestonly);
@@ -1350,8 +1323,7 @@ public class Package implements Serializable {
       // time, as forward references are permitted.
       List<Label> allTests = new ArrayList<>();
       for (Rule rule : rules) {
-        if (TargetUtils.isTestRule(rule) && !TargetUtils.hasManualTag(rule)
-            && !TargetUtils.isObsolete(rule)) {
+        if (TargetUtils.isTestRule(rule) && !TargetUtils.hasManualTag(rule)) {
           allTests.add(rule.getLabel());
         }
       }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
index cd407b6a49..1c56072dc3 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
@@ -316,9 +316,6 @@ public class PackageDeserializer {
     // It's important to do this after setting the default visibility, since that implicitly sets
     // this bit to true
     builder.setDefaultVisibilitySet(packagePb.getDefaultVisibilitySet());
-    if (packagePb.hasDefaultObsolete()) {
-      builder.setDefaultObsolete(packagePb.getDefaultObsolete());
-    }
     if (packagePb.hasDefaultTestonly()) {
       builder.setDefaultTestonly(packagePb.getDefaultTestonly());
     }
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 4df548616e..a641c7c5b1 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
@@ -159,18 +159,6 @@ public final class PackageFactory {
     }
   }
 
-  private static class DefaultObsolete extends PackageArgument<Boolean> {
-    private DefaultObsolete() {
-      super("default_obsolete", Type.BOOLEAN);
-    }
-
-    @Override
-    protected void process(Package.LegacyBuilder pkgBuilder, Location location,
-        Boolean value) {
-      pkgBuilder.setDefaultObsolete(value);
-    }
-  }
-
   private static class DefaultTestOnly extends PackageArgument<Boolean> {
     private DefaultTestOnly() {
       super("default_testonly", Type.BOOLEAN);
@@ -432,7 +420,6 @@ public final class PackageFactory {
            .add(new DefaultDeprecation())
            .add(new DefaultDistribs())
            .add(new DefaultLicenses())
-           .add(new DefaultObsolete())
            .add(new DefaultTestOnly())
            .add(new DefaultVisibility())
            .add(new Features())
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java b/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java
index 8971cf247b..83b8a64730 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageSerializer.java
@@ -200,7 +200,6 @@ public class PackageSerializer {
       }
     }
 
-    builder.setDefaultObsolete(pkg.getDefaultObsolete());
     builder.setDefaultTestonly(pkg.getDefaultTestOnly());
     if (pkg.getDefaultDeprecation() != null) {
       builder.setDefaultDeprecation(pkg.getDefaultDeprecation());
diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
index fb0cee9520..6dd3dac983 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -119,18 +119,6 @@ public final class TargetUtils {
     return hasConstraint(rule, "external");
   }
 
-  /**
-   * Returns true, iff the given target is a rule and it has the attribute
-   * <code>obsolete<code/> set to one.
-   */
-  public static boolean isObsolete(Target target) {
-    if (!(target instanceof Rule)) {
-      return false;
-    }
-    Rule rule = (Rule) target;
-    return (rule.isAttrDefined("obsolete", Type.BOOLEAN))
-        && NonconfigurableAttributeMapper.of(rule).get("obsolete", Type.BOOLEAN);
-  }
 
   /**
    * If the given target is a rule, returns its <code>deprecation<code/> value, or null if unset.
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java b/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java
index df01326462..3f486a4ce5 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java
@@ -58,20 +58,20 @@ public final class FilteringPolicies {
 
   public static final FilteringPolicy NO_FILTER = new NoFilter();
 
-  private static class FilterManualAndObsolete extends AbstractFilteringPolicy {
+  private static class FilterManual extends AbstractFilteringPolicy {
     @Override
     public boolean shouldRetain(Target target, boolean explicit) {
-      return explicit || !(TargetUtils.hasManualTag(target) || TargetUtils.isObsolete(target));
+      return explicit || !(TargetUtils.hasManualTag(target));
     }
   }
 
-  public static final FilteringPolicy FILTER_MANUAL_AND_OBSOLETE = new FilterManualAndObsolete();
+  public static final FilteringPolicy FILTER_MANUAL = new FilterManual();
 
   private static class FilterTests extends AbstractFilteringPolicy {
     @Override
     public boolean shouldRetain(Target target, boolean explicit) {
       return TargetUtils.isTestOrTestSuiteRule(target)
-          && FILTER_MANUAL_AND_OBSOLETE.shouldRetain(target, explicit);
+          && FILTER_MANUAL.shouldRetain(target, explicit);
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicy.java b/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicy.java
index ac27fb09dc..1513374f4d 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicy.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicy.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 /**
  * A filtering policy defines how target patterns are matched. For instance, we may wish to select
- * only tests, no tests, or remove obsolete targets.
+ * only tests or no tests.
  */
 public interface FilteringPolicy extends Serializable {
 
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
index 4d8eea607f..0a39ecea9c 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
@@ -571,7 +571,7 @@ public class LoadingPhaseRunner {
       boolean keepGoing) throws TargetParsingException, InterruptedException {
     ResolvedTargets<Target> result =
         targetPatternEvaluator.parseTargetPatternList(eventHandler, targetPatterns,
-            FilteringPolicies.FILTER_MANUAL_AND_OBSOLETE, keepGoing);
+            FilteringPolicies.FILTER_MANUAL, keepGoing);
     if (compileOneDependency) {
       return new CompileOneDependencyTransformer(packageManager)
           .transformCompileOneDependency(eventHandler, result);
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java
index 6661dbb879..23db88dc66 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java
@@ -43,8 +43,7 @@ import java.util.logging.Logger;
  */
 public class PathPackageLocator implements Serializable {
 
-  public static final Set<String> DEFAULT_TOP_LEVEL_EXCLUDES =
-      ImmutableSet.of("experimental", "obsolete");
+  public static final Set<String> DEFAULT_TOP_LEVEL_EXCLUDES = ImmutableSet.of("experimental");
 
   /**
    * An interface which accepts {@link PathFragment}s.