Redesign xcode_config rule to be evaluated at the level of configuration instead of target depss

--
MOS_MIGRATED_REVID=113398355

1 files changed, 7 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
index 58275f034f..ecfb643458 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
@@ -47,7 +47,8 @@ public class XcodeConfigRule implements RuleDefinition {
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr(DEFAULT_ATTR_NAME, LABEL)
             .allowedRuleClasses("xcode_version")
-            .allowedFileTypes())
+            .allowedFileTypes()
+            .nonconfigurable("this rule determines configuration"))
         /* <!-- #BLAZE_RULE(proto_library).ATTRIBUTE(version) -->
         Accepted <code>xcode_version<code> targets that may be used.
         If the value of the <code>xcode_version</code> build flag matches one of the aliases
@@ -56,14 +57,17 @@ public class XcodeConfigRule implements RuleDefinition {
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr(VERSIONS_ATTR_NAME, LABEL_LIST)
             .allowedRuleClasses("xcode_version")
-            .allowedFileTypes())
+            .allowedFileTypes()
+            .nonconfigurable("this rule determines configuration"))
         /* <!-- #BLAZE_RULE(proto_library).ATTRIBUTE(version) -->
         Whether to require the build's xcode version match one of the declared targets.
         If true, this will raise an error if either the <code>xcode_version</code> flag value
         or <code>default</code> attribute value do not match one of the versions declared
         among <code>xcode_verison</code> targets.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
-        .add(attr(REQUIRE_DEFINED_VERSIONS_ATTR_NAME, BOOLEAN).value(false))
+        .add(attr(REQUIRE_DEFINED_VERSIONS_ATTR_NAME, BOOLEAN)
+            .value(false)
+            .nonconfigurable("this rule determines configuration"))
         .build();
   }