Simplify link params collection a little bit.

--
MOS_MIGRATED_REVID=92843582

2 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java
index 4e4804b177..a256332cc3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java
@@ -186,12 +186,9 @@ public final class CcLinkParams {
      * Includes link parameters from a CcLinkParamsProvider provider.
      */
     public Builder addTransitiveProvider(CcLinkParamsProvider provider) {
-      if (provider == null) {
-        return this;
+      if (provider != null) {
+        add(provider.getCcLinkParamsStore());
       }
-
-      CcLinkParams args = provider.getCcLinkParams(linkingStatically, linkShared);
-      addTransitiveArgs(args);
       return this;
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsProvider.java
index 11f6011f50..506a0cc9ab 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsProvider.java
@@ -31,7 +31,7 @@ public final class CcLinkParamsProvider implements TransitiveInfoProvider {
         public CcLinkParamsStore apply(TransitiveInfoCollection input) {
           CcLinkParamsProvider provider = input.getProvider(
               CcLinkParamsProvider.class);
-          return provider == null ? null : provider.store;
+          return provider == null ? null : provider.getCcLinkParamsStore();
         }
       };
 
@@ -41,6 +41,11 @@ public final class CcLinkParamsProvider implements TransitiveInfoProvider {
     this.store = new CcLinkParamsStoreImpl(store);
   }
 
+  /** Returns the link params store. */
+  public CcLinkParamsStore getCcLinkParamsStore() {
+    return store;
+  }
+
   /**
    * Returns link parameters given static / shared linking settings.
    */