Remove objc_includes_prioritize_static_libs

This flag was experimental but is now always-on.

RELNOTES: None.
PiperOrigin-RevId: 161234569

3 files changed, 0 insertions, 26 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java
index 1c93df5bc1..4e7dc479cb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java
@@ -646,11 +646,6 @@ public class IosTestTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testLinkIncludeOrder_frameworksAndSystemLibsFirst() throws Exception {
-    checkLinkIncludeOrderFrameworksAndSystemLibsFirst(RULE_TYPE);
-  }
-
-  @Test
   public void testMergesActoolPartialInfoplist() throws Exception {
     checkMergesPartialInfoplists(RULE_TYPE);
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java
index c167d312b5..563dd887b4 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java
@@ -555,11 +555,6 @@ public class ObjcBinaryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testLinkIncludeOrder_frameworksAndSystemLibsFirst() throws Exception {
-    checkLinkIncludeOrderFrameworksAndSystemLibsFirst(RULE_TYPE);
-  }
-  
-  @Test
   public void testLinksDylibsTransitively() throws Exception {
     checkLinksDylibsTransitively(RULE_TYPE);
   }
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 75e3d9c07e..5ec6bc0c82 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
@@ -1052,22 +1052,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
         getSourceArtifact("fx/fx2.framework/d"));
   }
 
-  protected void checkLinkIncludeOrderFrameworksAndSystemLibsFirst(RuleType ruleType)
-      throws Exception {
-    useConfiguration("--noobjc_includes_prioritize_static_libs");
-    scratch.file("fx/fx1.framework");
-    scratch.file("fx/BUILD", "objc_framework(name = 'fx')");
-    scratch.file("x/a.m");
-    ruleType.scratchTarget(
-        scratch, "srcs", "['a.m']", "sdk_frameworks", "['fx']", "sdk_dylibs", "['libdy1']");
-
-    CommandAction linkAction = linkAction("//x:x");
-    String linkActionArgs = Joiner.on(" ").join(linkAction.getArguments());
-
-    assertThat(linkActionArgs.indexOf("-F")).isLessThan(linkActionArgs.indexOf("-filelist"));
-    assertThat(linkActionArgs.indexOf("-l")).isLessThan(linkActionArgs.indexOf("-filelist"));
-  }
-
   protected void checkLinkIncludeOrderStaticLibsFirst(RuleType ruleType) throws Exception {
     scratch.file("fx/fx1.framework");
     scratch.file("fx/BUILD", "objc_framework(name = 'fx')");