1 files changed, 2 insertions, 30 deletions
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());
         }
       }