diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java index 214ba8ae99..6dcbb80dfa 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java @@ -34,8 +34,12 @@ public class XcodeVersionRule implements RuleDefinition { static final String DEFAULT_IOS_SDK_VERSION_ATTR_NAME = "default_ios_sdk_version"; static final String DEFAULT_WATCHOS_SDK_VERSION_ATTR_NAME = "default_watchos_sdk_version"; static final String DEFAULT_TVOS_SDK_VERSION_ATTR_NAME = "default_tvos_sdk_version"; - static final String DEFAULT_MACOSX_SDK_VERSION_ATTR_NAME = "default_macosx_sdk_version"; - + // TODO(b/37508376): Remove in lieu of default_macos_sdk_version. + static final String DEPRECATED_DEFAULT_MACOSX_SDK_VERSION_ATTR_NAME = + "default_macosx_sdk_version"; + static final String DEFAULT_MACOS_SDK_VERSION_ATTR_NAME = + "default_macos_sdk_version"; + @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder @@ -73,11 +77,13 @@ public class XcodeVersionRule implements RuleDefinition { <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ .add(attr(DEFAULT_TVOS_SDK_VERSION_ATTR_NAME, STRING) .nonconfigurable("this rule determines configuration")) - /* <!-- #BLAZE_RULE(xcode_version).ATTRIBUTE(default_macosx_sdk_version) --> + /* <!-- #BLAZE_RULE(xcode_version).ATTRIBUTE(default_macos_sdk_version) --> The macosx sdk version that is used by default when this version of xcode is being used. - The <code>macosx_sdk_version</code> build flag will override the value specified here. + The <code>macos_sdk_version</code> build flag will override the value specified here. <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ - .add(attr(DEFAULT_MACOSX_SDK_VERSION_ATTR_NAME, STRING) + .add(attr(DEFAULT_MACOS_SDK_VERSION_ATTR_NAME, STRING) + .nonconfigurable("this rule determines configuration")) + .add(attr(DEPRECATED_DEFAULT_MACOSX_SDK_VERSION_ATTR_NAME, STRING) .nonconfigurable("this rule determines configuration")) .build(); } |