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

4 files changed, 9 insertions, 11 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index a388e41943..084b03325c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -289,8 +289,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         action.getLinkCommandLine().getBuildInfoHeaderArtifacts());
     assertThat(cppLinkInfo.getBuildInfoHeaderArtifactList())
         .containsExactlyElementsIn(buildInfoHeaderArtifacts);
-    assertThat(cppLinkInfo.getLinkOptList())
-        .containsExactlyElementsIn(action.getLinkCommandLine().getRawLinkArgv());
+    assertThat(cppLinkInfo.getLinkOptList()).containsExactlyElementsIn(action.getArguments());
   }
 
   @Test
@@ -324,8 +323,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
         action.getLinkCommandLine().getBuildInfoHeaderArtifacts());
     assertThat(cppLinkInfo.getBuildInfoHeaderArtifactList())
         .containsExactlyElementsIn(buildInfoHeaderArtifacts);
-    assertThat(cppLinkInfo.getLinkOptList())
-        .containsExactlyElementsIn(action.getLinkCommandLine().getRawLinkArgv());
+    assertThat(cppLinkInfo.getLinkOptList()).containsExactlyElementsIn(action.getArguments());
   }
 
   @Test
@@ -340,7 +338,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
 
     CppLinkAction action = (CppLinkAction) getGeneratingAction(archive);
 
-    assertThat(action.getArgv()).contains(archive.getExecPathString());
+    assertThat(action.getArguments()).contains(archive.getExecPathString());
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index 3667a2d21d..bc2e57f63f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
@@ -128,7 +128,7 @@ public class CppLinkActionTest extends BuildViewTestCase {
                 ImmutableList.<LibraryToLink>of(),
                 featureConfiguration)
             .build();
-    assertThat(linkAction.getArgv()).contains("some_flag");
+    assertThat(linkAction.getArguments()).contains("some_flag");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
index 30adaf693c..116b3284e2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
@@ -35,7 +35,7 @@ public final class LibraryLinkingTest extends BuildViewTestCase {
       throws Exception {
     // Strip the first parameters from the argv, which are the dynamic library script
     // (usually tools/cpp/link_dynamic_library.sh), and its arguments.
-    return linkAction.getRawLinkArgv().subList(6, optionPatterns.length + 6);
+    return linkAction.getArguments().subList(6, optionPatterns.length + 6);
   }
 
   private void assertLinkopts(CppLinkAction linkAction, String... optionPatterns) throws Exception {
@@ -102,7 +102,7 @@ public final class LibraryLinkingTest extends BuildViewTestCase {
                   }
                 }));
     CppLinkAction archiveLink = (CppLinkAction) getGeneratingAction(archiveLib);
-    List<String> args = archiveLink.getArgv();
+    List<String> args = archiveLink.getArguments();
     assertThat(args).doesNotContain(linkOpt1);
     assertThat(args).doesNotContain(linkOpt2);
 
@@ -115,7 +115,7 @@ public final class LibraryLinkingTest extends BuildViewTestCase {
     // This artifact is generated by a SolibSymlinkAction, so we need to go back two levels.
     CppLinkAction solibLink =
         (CppLinkAction) getGeneratingAction(getGeneratingAction(soLib).getPrimaryInput());
-    args = solibLink.getArgv();
+    args = solibLink.getArguments();
     assertThat(args).contains(linkOpt1);
     assertThat(args).contains(linkOpt2);
   }
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");
   }  
 }