1 files changed, 6 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java
index 32afe7963a..7597d0ab8c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java
@@ -17,34 +17,23 @@ package com.google.devtools.build.lib.rules.cpp;
 import com.google.common.base.Function;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.NativeInfo;
-import com.google.devtools.build.lib.packages.NativeProvider;
 import com.google.devtools.build.lib.rules.cpp.CcLinkParams.Builder;
 import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore.CcLinkParamsStoreImpl;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 
 /** A target that provides C linker parameters. */
 @Immutable
 @AutoCodec
-@SkylarkModule(
-  name = "cc_link_params_info",
-  title = "cc_link_params_info",
-  documented = false,
-  category = SkylarkModuleCategory.PROVIDER,
-  doc = "Link params provider"
-)
-public final class CcLinkParamsInfo extends NativeInfo {
-  public static final NativeProvider<CcLinkParamsInfo> PROVIDER =
-      new NativeProvider<CcLinkParamsInfo>(CcLinkParamsInfo.class, "link_params") {};
+public final class CcLinkParamsInfo {
   public static final Function<TransitiveInfoCollection, CcLinkParamsStore> TO_LINK_PARAMS =
       input -> {
         // ... then try Skylark.
-        CcLinkParamsInfo provider = input.get(PROVIDER);
-        if (provider != null) {
-          return provider.getCcLinkParamsStore();
+        CcLinkingInfo provider = input.get(CcLinkingInfo.PROVIDER);
+        CcLinkParamsInfo ccLinkParamsInfo =
+            provider == null ? null : provider.getCcLinkParamsInfo();
+        if (ccLinkParamsInfo != null) {
+          return ccLinkParamsInfo.getCcLinkParamsStore();
         }
         return null;
       };
@@ -53,7 +42,6 @@ public final class CcLinkParamsInfo extends NativeInfo {
 
   @AutoCodec.Instantiator
   public CcLinkParamsInfo(CcLinkParamsStore store) {
-    super(PROVIDER);
     this.store = new CcLinkParamsStoreImpl(store);
   }