Remove default_macosx_sdk_version (use default_macos_sdk_version only)

RELNOTES: None.
PiperOrigin-RevId: 166888780

2 files changed, 3 insertions, 20 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 6dcbb80dfa..bdf5b1b77f 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,11 +34,7 @@ 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";
-  // 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";
+  static final String DEFAULT_MACOS_SDK_VERSION_ATTR_NAME = "default_macos_sdk_version";
 
   @Override
   public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
@@ -83,8 +79,6 @@ public class XcodeVersionRule implements RuleDefinition {
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .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();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRuleData.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRuleData.java
index aa9ad6a5f2..e98bb235ae 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRuleData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRuleData.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.rules.apple;
 
-import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -54,7 +53,8 @@ public class XcodeVersionRuleData implements TransitiveInfoProvider {
         attrMapper.get(XcodeVersionRule.DEFAULT_WATCHOS_SDK_VERSION_ATTR_NAME, Type.STRING);
     String tvosSdkVersionString =
         attrMapper.get(XcodeVersionRule.DEFAULT_TVOS_SDK_VERSION_ATTR_NAME, Type.STRING);
-    String macosxSdkVersionString = getMacosSdkVersionString(attrMapper);
+    String macosxSdkVersionString =
+        attrMapper.get(XcodeVersionRule.DEFAULT_MACOS_SDK_VERSION_ATTR_NAME, Type.STRING);
     this.version = xcodeVersion;
     this.xcodeVersionProperties = new XcodeVersionProperties(xcodeVersion, iosSdkVersionString,
         watchosSdkVersionString, tvosSdkVersionString, macosxSdkVersionString);
@@ -89,15 +89,4 @@ public class XcodeVersionRuleData implements TransitiveInfoProvider {
   public List<String> getAliases() {
     return aliases;
   }
-  
-  private static String getMacosSdkVersionString(NonconfigurableAttributeMapper attrMapper) {
-    String versionAttr =
-        attrMapper.get(XcodeVersionRule.DEFAULT_MACOS_SDK_VERSION_ATTR_NAME, Type.STRING);
-    if (Strings.isNullOrEmpty(versionAttr)) {
-      return attrMapper.get(XcodeVersionRule.DEPRECATED_DEFAULT_MACOSX_SDK_VERSION_ATTR_NAME,
-          Type.STRING);
-    } else {
-      return versionAttr;
-    }
-  }
 }