C++: Removes logic for linkopts expansion.

RELNOTES[INC]:Labels in C++ rules' linkopts attribute are not expanded anymore
unless they are wrapped, e.g: $(location //foo:bar)

PiperOrigin-RevId: 205385711

2 files changed, 0 insertions, 41 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index 0ea347a0dd..54462ad0fe 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -646,27 +646,6 @@ public class CcCommonTest extends BuildViewTestCase {
   }
 
   @Test
-  public void testMissingLabelInLinkopts() throws Exception {
-    scratch.file(
-        "linklow/BUILD",
-        "genrule(name = 'linklow_linker_script',",
-        "  srcs = [ 'default_linker_script' ],",
-        "  tools = [ 'default_linker_script' ],",
-        "  outs = [ 'linklow.lds' ],",
-        "  cmd = 'cat  $< > $@')");
-    checkError(
-        "ocean/scoring2",
-        "ms-ascorer",
-        // error:
-        "could not resolve label '//linklow:linklow_linker_script'",
-        "cc_binary(name = 'ms-ascorer',",
-        "    srcs = [ ],",
-        "    deps = [ ':ascorer-servlet'],",
-        "    linkopts = [ '-static', '-Xlinker', '-script', '//linklow:linklow_linker_script'])",
-        "cc_library(name = 'ascorer-servlet')");
-  }
-
-  @Test
   public void testCcLibraryWithDashStatic() throws Exception {
     checkWarning(
         "badlib",
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 b3c23cd370..f630f34f41 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
@@ -1489,24 +1489,4 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     useConfiguration("--experimental_stl=//a:stl");
     getConfiguredTarget("//a:a");
   }
-
-  @Test
-  public void testNoExpandLinkoptsLabels() throws Exception {
-    useConfiguration("--noexperimental_expand_linkopts_labels");
-    scratchConfiguredTarget(
-        "b", "b", "cc_library(", "    name = 'b',", "    linkopts=['//foo/bar'])");
-    assertNoEvents();
-  }
-
-  @Test
-  public void testExpandLinkoptsLabels() throws Exception {
-    useConfiguration("--experimental_expand_linkopts_labels");
-    checkError(
-        "b",
-        "b",
-        "could not resolve label",
-        "cc_library(",
-        "    name = 'b',",
-        "    linkopts=['//foo/bar'])");
-  }
 }