1 files changed, 7 insertions, 28 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 245105e020..cdbc8833b7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -89,7 +89,6 @@ import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
-import com.google.devtools.build.lib.rules.apple.XcodeVersionProperties;
 import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.cpp.CppLinkAction;
 import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs;
@@ -202,23 +201,24 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
   private String configurationDir(
       String arch, ConfigurationDistinguisher configurationDistinguisher,
       DottedVersion minOsVersion) {
+    String minOsSegment = minOsVersion == null ? "" : "-min" + minOsVersion;
     switch (configurationDistinguisher) {
       case UNKNOWN:
         return String.format("%s-out/ios_%s-fastbuild/", TestConstants.PRODUCT_NAME, arch);
       case APPLEBIN_IOS:
         return String.format(
-            "%1$s-out/ios-%2$s-min%4$s-%3$s-ios_%2$s-fastbuild/",
+            "%1$s-out/ios-%2$s%4$s-%3$s-ios_%2$s-fastbuild/",
             TestConstants.PRODUCT_NAME,
             arch,
             configurationDistinguisher.toString().toLowerCase(Locale.US),
-            minOsVersion);
+            minOsSegment);
       case APPLEBIN_WATCHOS:
         return String.format(
-            "%1$s-out/watchos-%2$s-min%4$s-%3$s-watchos_%2$s-fastbuild/",
+            "%1$s-out/watchos-%2$s%4$s-%3$s-watchos_%2$s-fastbuild/",
             TestConstants.PRODUCT_NAME,
             arch,
             configurationDistinguisher.toString().toLowerCase(Locale.US),
-            minOsVersion);
+            minOsSegment);
       default:
         throw new AssertionError();
     }
@@ -236,8 +236,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
    */
   protected String configurationBin(
       String arch, ConfigurationDistinguisher configurationDistinguisher) {
-    return configurationBin(arch, configurationDistinguisher,
-        defaultMinimumOs(configurationDistinguisher));
+    return configurationBin(arch, configurationDistinguisher, null);
   }
 
   /**
@@ -261,23 +260,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
   }
 
   /**
-   * Returns the default minimum os version that dependencies under a given configuration
-   * distinguisher (and thus a given platform type) will be compiled for.
-   */
-  protected static DottedVersion defaultMinimumOs(
-      ConfigurationDistinguisher configurationDistinguisher) {
-    switch (configurationDistinguisher) {
-      case UNKNOWN:
-      case APPLEBIN_IOS:
-        return DEFAULT_IOS_SDK_VERSION;
-      case APPLEBIN_WATCHOS:
-        return DottedVersion.fromString(XcodeVersionProperties.DEFAULT_WATCHOS_SDK_VERSION);
-      default:
-        throw new AssertionError();
-    }
-  }
-
-  /**
    * Returns the genfiles dir for iOS builds in the root architecture.
    */
   protected static String rootConfigurationGenfiles() {
@@ -3626,10 +3608,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
 
     assertThat(Artifact.toExecPaths(genOAction.getInputs()))
         .contains(
-            configurationGenfiles(
-                    "x86_64",
-                    ConfigurationDistinguisher.UNKNOWN,
-                    defaultMinimumOs(ConfigurationDistinguisher.UNKNOWN))
+            configurationGenfiles("x86_64", ConfigurationDistinguisher.UNKNOWN, null)
                 + "/x/gen.m");
   }