From 146c2457808318191b7afd3424170fea13eff28b Mon Sep 17 00:00:00 2001 From: janakr Date: Wed, 24 Jan 2018 12:54:15 -0800 Subject: Add codecs for TestConfiguration, ConfiguredFragmentValue, and TestConfigFragment. Thanks to shahan@ for the TestConfigFragment code. PiperOrigin-RevId: 183127152 --- .../devtools/build/lib/analysis/test/TestConfiguration.java | 2 ++ .../build/lib/skyframe/ConfigurationFragmentValue.java | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java index 241008e57d..e50deeded7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java @@ -37,7 +37,9 @@ import com.google.devtools.common.options.TriState; import java.util.List; /** Test-related options. */ +@AutoCodec public class TestConfiguration extends Fragment { + public static final ObjectCodec CODEC = new TestConfiguration_AutoCodec(); /** Command-line options. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java index 6fd58f605e..3ec99dbcd1 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java @@ -23,10 +23,13 @@ import com.google.devtools.build.lib.concurrent.BlazeInterners; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.packages.RuleClassProvider; +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.SerializationException; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.strings.StringCodecs; import com.google.devtools.build.lib.util.Fingerprint; +import com.google.devtools.build.lib.vfs.FileSystemProvider; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; @@ -36,12 +39,13 @@ import java.io.IOException; import java.util.Objects; import javax.annotation.Nullable; -/** - * A Skyframe node representing a build configuration fragment. - */ +/** A Skyframe node representing a build configuration fragment. */ @Immutable @ThreadSafe +@AutoCodec(dependency = FileSystemProvider.class) public class ConfigurationFragmentValue implements SkyValue { + public static final InjectingObjectCodec CODEC = + new ConfigurationFragmentValue_AutoCodec(); @Nullable private final BuildConfiguration.Fragment fragment; -- cgit v1.2.3