Put the platform version from the options into the output directory name instead of the one computed based on xcode_config.

RELNOTES: None.
PiperOrigin-RevId: 172064337

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
index c6ea84be26..1293c102c1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -390,12 +390,12 @@ public class AppleCommandLineOptions extends FragmentOptions {
   /**
    * Returns whether the minimum OS version is explicitly set for the current platform.
    */
-  public boolean isMinimumOsVersionExplicitlySet() {
+  public DottedVersion getMinimumOsVersion() {
     switch (applePlatformType) {
-      case IOS: return iosMinimumOs != null;
-      case MACOS: return macosMinimumOs != null;
-      case TVOS: return tvosMinimumOs != null;
-      case WATCHOS: return watchosMinimumOs != null;
+      case IOS: return iosMinimumOs;
+      case MACOS: return macosMinimumOs;
+      case TVOS: return tvosMinimumOs;
+      case WATCHOS: return watchosMinimumOs;
       default: throw new IllegalStateException();
     }
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
index fd39b65fe5..752bf64e48 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
@@ -575,8 +575,8 @@ public class AppleConfiguration extends BuildConfiguration.Fragment {
       components.add(applePlatformType.toString().toLowerCase());
       components.add(appleSplitCpu);
 
-      if (!isMandatoryMinimumVersion() || options.isMinimumOsVersionExplicitlySet()) {
-        components.add("min" + getMinimumOsForPlatformType(applePlatformType));
+      if (options.getMinimumOsVersion() != null) {
+        components.add("min" + options.getMinimumOsVersion());
       }
     }
     if (shouldDistinguishOutputDirectory()) {