Narrow the LinkCommandLine API.

Previously it had too many essentially identical accessors. This trims it down a bit and adjusts the call sites.

This cl changes the command line passed to tests slightly - now they can possibly contain linkstamping command prepended to actual linker invocation.

RELNOTES: None.
PiperOrigin-RevId: 166888575

1 files changed, 2 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java
index cc2b748643..8b7fba8160 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java
@@ -154,7 +154,7 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase {
     CommandAction linkAction = getGeneratingSpawnAction(binArtifact);
     CppLinkAction objcLibArchiveAction = (CppLinkAction) getGeneratingAction(
         getFirstArtifactEndingWith(linkAction.getInputs(), "liblib.a"));
-    assertThat(Joiner.on(" ").join(objcLibArchiveAction.getArgv())).contains("ios_arm64");
+    assertThat(Joiner.on(" ").join(objcLibArchiveAction.getArguments())).contains("ios_arm64");
   }
   
   @Test
@@ -176,6 +176,6 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase {
     CommandAction linkAction = linkAction("//a:bin");
     CppLinkAction objcLibCompileAction = (CppLinkAction) getGeneratingAction(
         getFirstArtifactEndingWith(linkAction.getInputs(), "liblib.a"));
-    assertThat(Joiner.on(" ").join(objcLibCompileAction.getArgv())).contains("watchos_armv7k");
+    assertThat(Joiner.on(" ").join(objcLibCompileAction.getArguments())).contains("watchos_armv7k");
   }  
 }