From 1cf7c7210f88719f2971d1a8c9da55c7fd1a7c11 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 25 Jan 2018 09:05:08 -0800 Subject: Static libraries are not a valid input to ar RELNOTES: None PiperOrigin-RevId: 183246711 --- .../com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java') 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 da85bfdd2f..a6bda43c08 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 @@ -756,7 +756,6 @@ public class CppLinkActionTest extends BuildViewTestCase { for (LinkTargetType linkType : targetTypesToTest) { scratch.deleteFile("dummyRuleContext/BUILD"); - Artifact staticLibrary = scratchArtifact("staticLibrary." + linkType.getExtension()); Artifact output = scratchArtifact("output." + linkType.getExtension()); CppLinkActionBuilder builder = @@ -769,8 +768,6 @@ public class CppLinkActionTest extends BuildViewTestCase { .setLibraryIdentifier("foo") .addObjectFiles(ImmutableList.of(testTreeArtifact)) .addObjectFile(objectFile) - .addLibrary( - LinkerInputs.precompiledLibraryToLink(staticLibrary, linkType.getLinkerOutput())) // Makes sure this doesn't use a params file. .setFake(true); @@ -779,8 +776,7 @@ public class CppLinkActionTest extends BuildViewTestCase { .containsAllOf( library0.getExecPathString(), library1.getExecPathString(), - objectFile.getExecPathString(), - staticLibrary.getExecPathString()) + objectFile.getExecPathString()) .inOrder(); } } -- cgit v1.2.3