1 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java
index 808db7be7d..8039c7b87f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java
@@ -20,11 +20,10 @@ import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.collect.CollectionUtils;
 import com.google.devtools.build.lib.concurrent.ThreadSafety;
-import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodec;
+import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.Strategy;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
-import com.google.devtools.build.lib.vfs.FileSystemProvider;
 
 /**
  * Factory for creating new {@link LinkerInput} objects.
@@ -145,9 +144,9 @@ public abstract class LinkerInputs {
    * A library the user can link to. This is different from a simple linker input in that it also
    * has a library identifier.
    */
-  @AutoCodec(strategy = Strategy.POLYMORPHIC, dependency = FileSystemProvider.class)
+  @AutoCodec(strategy = Strategy.POLYMORPHIC)
   public interface LibraryToLink extends LinkerInput {
-    public static final InjectingObjectCodec<LibraryToLink, FileSystemProvider> CODEC =
+    public static final ObjectCodec<LibraryToLink> CODEC =
         new LinkerInputs_LibraryToLink_AutoCodec();
 
     ImmutableMap<Artifact, Artifact> getLtoBitcodeFiles();
@@ -174,9 +173,9 @@ public abstract class LinkerInputs {
    * library that it links to.
    */
   @ThreadSafety.Immutable
-  @AutoCodec(dependency = FileSystemProvider.class)
+  @AutoCodec
   public static class SolibLibraryToLink implements LibraryToLink {
-    public static final InjectingObjectCodec<SolibLibraryToLink, FileSystemProvider> CODEC =
+    public static final ObjectCodec<SolibLibraryToLink> CODEC =
         new LinkerInputs_SolibLibraryToLink_AutoCodec();
 
     private final Artifact solibSymlinkArtifact;
@@ -276,10 +275,10 @@ public abstract class LinkerInputs {
 
   /** This class represents a library that may contain object files. */
   @ThreadSafety.Immutable
-  @AutoCodec(dependency = FileSystemProvider.class)
+  @AutoCodec
   @VisibleForSerialization
   static class CompoundLibraryToLink implements LibraryToLink {
-    public static final InjectingObjectCodec<CompoundLibraryToLink, FileSystemProvider> CODEC =
+    public static final ObjectCodec<CompoundLibraryToLink> CODEC =
         new LinkerInputs_CompoundLibraryToLink_AutoCodec();
 
     private final Artifact libraryArtifact;