1 files changed, 4 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java
index f6bad1f0b2..5d2192b889 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java
@@ -19,7 +19,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.rules.cpp.FdoSupport.FdoMode;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.LipoMode;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
@@ -45,19 +44,16 @@ public class FdoSupportValue implements SkyValue {
   public static class Key implements SkyKey {
     private static final Interner<Key> interner = BlazeInterners.newWeakInterner();
 
-    private final LipoMode lipoMode;
     private final PathFragment fdoZip;
     private final FdoInputFile fdoPrefetchHintsFile;
     private final String fdoInstrument;
     private final FdoMode fdoMode;
 
     private Key(
-        LipoMode lipoMode,
         PathFragment fdoZip,
         FdoInputFile fdoPrefetchHintsFile,
         String fdoInstrument,
         FdoMode fdoMode) {
-      this.lipoMode = lipoMode;
       this.fdoZip = fdoZip;
       this.fdoPrefetchHintsFile = fdoPrefetchHintsFile;
       this.fdoInstrument = fdoInstrument;
@@ -67,17 +63,11 @@ public class FdoSupportValue implements SkyValue {
     @AutoCodec.Instantiator
     @AutoCodec.VisibleForSerialization
     static Key of(
-        LipoMode lipoMode,
         PathFragment fdoZip,
         FdoInputFile fdoPrefetchHintsFile,
         String fdoInstrument,
         FdoMode fdoMode) {
-      return interner.intern(
-          new Key(lipoMode, fdoZip, fdoPrefetchHintsFile, fdoInstrument, fdoMode));
-    }
-
-    public LipoMode getLipoMode() {
-      return lipoMode;
+      return interner.intern(new Key(fdoZip, fdoPrefetchHintsFile, fdoInstrument, fdoMode));
     }
 
     public PathFragment getFdoZip() {
@@ -107,8 +97,7 @@ public class FdoSupportValue implements SkyValue {
       }
 
       Key that = (Key) o;
-      return Objects.equals(this.lipoMode, that.lipoMode)
-          && Objects.equals(this.fdoZip, that.fdoZip)
+      return Objects.equals(this.fdoZip, that.fdoZip)
           && Objects.equals(this.fdoPrefetchHintsFile, that.fdoPrefetchHintsFile)
           && Objects.equals(this.fdoMode, that.fdoMode)
           && Objects.equals(this.fdoInstrument, that.fdoInstrument);
@@ -116,7 +105,7 @@ public class FdoSupportValue implements SkyValue {
 
     @Override
     public int hashCode() {
-      return Objects.hash(lipoMode, fdoZip, fdoPrefetchHintsFile, fdoInstrument);
+      return Objects.hash(fdoZip, fdoPrefetchHintsFile, fdoInstrument);
     }
 
     @Override
@@ -136,11 +125,10 @@ public class FdoSupportValue implements SkyValue {
   }
 
   public static SkyKey key(
-      LipoMode lipoMode,
       PathFragment fdoZip,
       FdoInputFile fdoPrefetchHintsFile,
       String fdoInstrument,
       FdoMode fdoMode) {
-    return Key.of(lipoMode, fdoZip, fdoPrefetchHintsFile, fdoInstrument, fdoMode);
+    return Key.of(fdoZip, fdoPrefetchHintsFile, fdoInstrument, fdoMode);
   }
 }