Deletes AutoCodec.Strategy.SINGLETON now that we have @AutoCodec field tags.

This also gets rid of some static initialization cycles which we should try very hard to avoid in the future.

PiperOrigin-RevId: 187334087

1 files changed, 1 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java
index edb9226a11..e7522851ba 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.devtools.build.lib.actions.ActionLookupValue;
 import com.google.devtools.build.lib.actions.Actions.GeneratingActions;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 
@@ -26,24 +25,18 @@ import com.google.devtools.build.skyframe.SkyFunctionName;
 public class CoverageReportValue extends ActionLookupValue {
 
   // There should only ever be one CoverageReportValue value in the graph.
-  public static final CoverageReportKey COVERAGE_REPORT_KEY = CoverageReportKey.INSTANCE;
+  @AutoCodec public static final CoverageReportKey COVERAGE_REPORT_KEY = new CoverageReportKey();
 
   CoverageReportValue(GeneratingActions generatingActions, boolean removeActionsAfterEvaluation) {
     super(generatingActions, removeActionsAfterEvaluation);
   }
 
-  @AutoCodec(strategy = AutoCodec.Strategy.SINGLETON)
   static class CoverageReportKey extends ActionLookupKey {
-    static final CoverageReportKey INSTANCE = new CoverageReportKey();
-    static final ObjectCodec<CoverageReportKey> CODEC =
-        new CoverageReportValue_CoverageReportKey_AutoCodec();
-
     private CoverageReportKey() {}
 
     @Override
     public SkyFunctionName functionName() {
       return SkyFunctions.COVERAGE_REPORT;
     }
-
   }
 }