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, 2 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index 6fc7684371..40c74d0bab 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -111,8 +111,10 @@ import org.junit.Before;
  * The common code that's shared between various builder tests.
  */
 public abstract class TimestampBuilderTestCase extends FoundationTestCase {
+  @AutoCodec
   protected static final ActionLookupValue.ActionLookupKey ACTION_LOOKUP_KEY =
       new SingletonActionLookupKey();
+
   protected static final Predicate<Action> ALWAYS_EXECUTE_FILTER = Predicates.alwaysTrue();
   protected static final String CYCLE_MSG = "Yarrrr, there be a cycle up in here";
 
@@ -501,10 +503,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase {
     }
   }
 
-  @AutoCodec(strategy = AutoCodec.Strategy.SINGLETON)
   static class SingletonActionLookupKey extends ActionLookupValue.ActionLookupKey {
-    public static final SingletonActionLookupKey INSTANCE = new SingletonActionLookupKey();
-
     @Override
     public SkyFunctionName functionName() {
       return SkyFunctions.CONFIGURED_TARGET;