From a41e01ee7ed395c4913ff31ed8c2e84297fabe1c Mon Sep 17 00:00:00 2001 From: cpeyser Date: Thu, 22 Feb 2018 09:27:40 -0800 Subject: Add @AutoCodec to SpawnAction. Refactor the SpawnAction API for extra actions so that it is non-generic and does not persist a GeneratedExtension, which is hard to serialize. PiperOrigin-RevId: 186627440 --- .../google/devtools/build/lib/actions/util/ActionsTestUtil.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/test/java/com/google/devtools/build') diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java index 89ede26f7d..04aa0d77ee 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java @@ -64,8 +64,8 @@ import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.exec.SingleBuildFileCache; import com.google.devtools.build.lib.packages.AspectDescriptor; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; -import com.google.devtools.build.lib.skyframe.serialization.SingletonCodec; +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.util.FileType; import com.google.devtools.build.lib.util.ResourceUsage; import com.google.devtools.build.lib.util.io.FileOutErr; @@ -267,11 +267,10 @@ public final class ActionsTestUtil { null, null); + @AutoCodec(strategy = Strategy.SINGLETON) static class NullArtifactOwner implements ArtifactOwner { - private static final ActionsTestUtil.NullArtifactOwner INSTANCE = + public static final ActionsTestUtil.NullArtifactOwner INSTANCE = new ActionsTestUtil.NullArtifactOwner(); - static final ObjectCodec CODEC = - SingletonCodec.of(INSTANCE, "null_artifact_owner"); @Override public Label getLabel() { -- cgit v1.2.3