Refactor link command line to live in CompilationSupport.

Also simplifies command line construction and removes redundant linker arguments.

--
MOS_MIGRATED_REVID=91613561

1 files changed, 5 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java
index 7171706dd8..17e8395789 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java
@@ -29,8 +29,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.Type;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
-import com.google.devtools.build.lib.rules.objc.ObjcActionsBuilder.ExtraLinkArgs;
-import com.google.devtools.build.lib.rules.objc.ObjcActionsBuilder.ExtraLinkInputs;
+import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs;
 import com.google.devtools.build.lib.rules.objc.ReleaseBundlingSupport.LinkedBinary;
 
 import java.util.ArrayList;
@@ -86,11 +85,11 @@ public abstract class IosTest implements RuleConfiguredTargetFactory {
 
     XcodeProductType productType;
     ExtraLinkArgs extraLinkArgs;
-    ExtraLinkInputs extraLinkInputs;
+    Iterable<Artifact> extraLinkInputs;
     if (!isXcTest(ruleContext)) {
       productType = XcodeProductType.APPLICATION;
       extraLinkArgs = new ExtraLinkArgs();
-      extraLinkInputs = new ExtraLinkInputs();
+      extraLinkInputs = ImmutableList.of();
     } else {
       productType = XcodeProductType.UNIT_TEST;
       XcodeProvider appIpaXcodeProvider =
@@ -111,18 +110,13 @@ public abstract class IosTest implements RuleConfiguredTargetFactory {
           "-bundle",
           "-bundle_loader", bundleLoader.getExecPathString());
 
-      extraLinkInputs = new ExtraLinkInputs(bundleLoader);
+      extraLinkInputs = ImmutableList.of(bundleLoader);
 
       filesToBuild.add(testApp.getIpa());
     }
 
-    if (ruleContext.getConfiguration().isCodeCoverageEnabled()) {
-      extraLinkArgs = extraLinkArgs.appendedWith(CompilationSupport.LINKER_COVERAGE_FLAGS);
-    }
-
     new CompilationSupport(ruleContext)
-        .registerLinkActions(
-            common.getObjcProvider(), extraLinkArgs, extraLinkInputs)
+        .registerLinkActions(common.getObjcProvider(), extraLinkArgs, extraLinkInputs)
         .registerJ2ObjcCompileAndArchiveActions(optionsProvider, common.getObjcProvider())
         .registerCompileAndArchiveActions(common, optionsProvider)
         .addXcodeSettings(xcodeProviderBuilder, common, optionsProvider)