Automated rollback of commit c7e343ad314aeab6283b5939bc8126a112140a11.

*** Reason for rollback ***

Rolling back after having come up with a more principled solution in b/73047818 that will add a more generic attribute called additional_linker_inputs so that users can depend on any file of any type and reference it from linkopts.

*** Original change description ***

C++: Allows adding linkopts through file.

The file can be generated during execution by a different rule.

RELNOTES:none
PiperOrigin-RevId: 185977745

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
index b467a7f4eb..2363a3e9cc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
@@ -105,26 +105,6 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase {
   }
 
   @Test
-  public void testLinkoptsFileIsExported() throws Exception {
-    AnalysisMock.get().ccSupport().setupCrosstool(mockToolsConfig);
-    useConfiguration();
-
-    scratch.file(
-        "x/BUILD",
-        "cc_binary(",
-        "    name = 'bin',",
-        "    srcs = ['bin.cc'],",
-        "    linkopts_file= 'bin.linkopts_file'",
-        ")");
-
-    ConfiguredTarget target = getConfiguredTarget("//x:bin");
-    Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE);
-    String variableValue =
-        getVariableValue(variables, CppLinkActionBuilder.LINK_OPTS_FILE_VARIABLE);
-    assertThat(variableValue).matches("x/bin.linkopts_file");
-  }
-
-  @Test
   public void testInterfaceLibraryBuildingVariablesWhenGenerationPossible() throws Exception {
     // Make sure the interface shared object generation is enabled in the configuration
     // (which it is not by default for some windows toolchains)