Remove compatible_with / restricted_to attributes from rule

classes that are exempt from constraint checking.

--
MOS_MIGRATED_REVID=95033646

2 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/constraints/EnvironmentRule.java b/src/main/java/com/google/devtools/build/lib/analysis/constraints/EnvironmentRule.java
index 8330dba872..8853d50267 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/constraints/EnvironmentRule.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/constraints/EnvironmentRule.java
@@ -57,8 +57,6 @@ public final class EnvironmentRule implements RuleDefinition {
             .allowedRuleClasses(EnvironmentRule.RULE_NAME)
             .allowedFileTypes(FileTypeSet.NO_FILE)
             .nonconfigurable("used for defining constraint models - this shouldn't be configured"))
-        .removeAttribute(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR)
-        .removeAttribute(RuleClass.RESTRICTED_ENVIRONMENT_ATTR)
         .exemptFromConstraintChecking("this rule *defines* a constraint")
         .setUndocumented()
         .build();
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index d841c2c991..d2c1f569cc 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -756,6 +756,8 @@ public final class RuleClass {
     public <TYPE> Builder exemptFromConstraintChecking(String reason) {
       Preconditions.checkState(this.supportsConstraintChecking);
       this.supportsConstraintChecking = false;
+      attributes.remove(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR);
+      attributes.remove(RuleClass.RESTRICTED_ENVIRONMENT_ATTR);
       return this;
     }