C++: Removes calls to setCcLinkparamsStore of CcLinkingInfo.Builder

This is in preparation for deleting CcLinkParamsStore. Not all calls to
setCcLinkparamsStore have been removed in this CL.

RELNOTES:none
PiperOrigin-RevId: 207516944

2 files changed, 43 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index 5b803e0761..3be5519f28 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -2024,4 +2024,30 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
             "java/foo/lib_resources.jar", "java/foo/dep_resources.jar", "java/foo/libdep-hjar.jar")
         .inOrder();
   }
+
+  @Test
+  public void testAndroidCcLinkParamsProvider() throws Exception {
+    scratch.file(
+        "java/foo/BUILD",
+        "cc_library(",
+        "  name='cc_dep',",
+        "  srcs=['dep.cc'],",
+        "  linkopts = ['-CC_DEP'],",
+        ")",
+        "android_library(",
+        "  name='lib',",
+        "  srcs=['lib.java'],",
+        "  deps=[':cc_dep'])");
+
+    ConfiguredTarget target = getConfiguredTarget("//java/foo:lib");
+
+    assertThat(
+            target
+                .get(AndroidCcLinkParamsProvider.PROVIDER)
+                .getLinkParams()
+                .getDynamicModeParamsForDynamicLibrary()
+                .flattenedLinkopts())
+        .containsExactly("-CC_DEP")
+        .inOrder();
+  }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
index 6bd4f038b3..889e788d18 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
@@ -1056,7 +1056,7 @@ public class SkylarkCcCommonTest extends BuildViewTestCase {
         "  fragments = ['cpp'],",
         ");");
     reporter.removeHandler(failFastHandler);
-    getConfiguredTarget("//a:r");
+    assertThat(getConfiguredTarget("//a:r")).isNull();
     assertContainsEvent(
         "Possible values for artifact_category: static_library, "
             + "alwayslink_static_library, dynamic_library, interface_library");
@@ -1336,6 +1336,22 @@ public class SkylarkCcCommonTest extends BuildViewTestCase {
     assertThat(setUpNeverlinkTest("False").getArguments()).contains("-NEVERLINK_OPTION");
   }
 
+  @Test
+  public void testEmptyCcLinkingInfoError() throws Exception {
+    scratch.file("a/BUILD", "load('//tools/build_defs/cc:rule.bzl', 'crule')", "crule(name='r')");
+    scratch.file("tools/build_defs/cc/BUILD", "");
+    scratch.file(
+        "tools/build_defs/cc/rule.bzl",
+        "def _impl(ctx):",
+        "  return [CcLinkingInfo()]",
+        "crule = rule(",
+        "  _impl,",
+        ");");
+    reporter.removeHandler(failFastHandler);
+    getConfiguredTarget("//a:r");
+    assertContainsEvent("Every CcLinkParams parameter must be passed to CcLinkingInfo.");
+  }
+
   private CppLinkAction setUpNeverlinkTest(String value) throws Exception {
     SkylarkCcCommonTestHelper.createFilesForTestingLinking(
         scratch,