diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
49 files changed, 8 insertions, 275 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index ceaf10cc9b..e5a0ab7af6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidA import com.google.devtools.build.lib.rules.cpp.CppConfiguration.DynamicMode; import com.google.devtools.build.lib.rules.cpp.CppOptions.DynamicModeConverter; import com.google.devtools.build.lib.rules.cpp.CppOptions.LibcTopLabelConverter; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; @@ -61,9 +60,6 @@ import javax.annotation.Nullable; ) @Immutable public class AndroidConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<AndroidConfiguration> CODEC = - new AndroidConfiguration_AutoCodec(); - /** * Converter for {@link * com.google.devtools.build.lib.rules.android.AndroidConfiguration.ConfigurationDistinguisher} @@ -267,8 +263,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { /** Android configuration options. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public static class Options extends FragmentOptions { - public static final ObjectCodec<Options> CODEC = new AndroidConfiguration_Options_AutoCodec(); - @Option( name = "Android configuration distinguisher", defaultValue = "MAIN", diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestConfiguration.java index 69e96e5d4c..6cb3ea1ab1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestConfiguration.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactor import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; 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.common.options.Option; @@ -35,15 +34,9 @@ import javax.annotation.Nullable; @AutoCodec @Immutable public class AndroidLocalTestConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<AndroidLocalTestConfiguration> CODEC = - new AndroidLocalTestConfiguration_AutoCodec(); - /** android_local_test specific options */ @AutoCodec(strategy = Strategy.PUBLIC_FIELDS) public static final class Options extends FragmentOptions { - public static final ObjectCodec<Options> CODEC = - new AndroidLocalTestConfiguration_Options_AutoCodec(); - @Option( name = "experimental_android_local_test_binary_resources", defaultValue = "false", diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactory.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactory.java index 419c6042ac..cf25d972cf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactory.java @@ -35,7 +35,6 @@ import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.packages.RuleErrorConsumer; import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidAaptVersion; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.common.options.EnumConverter; @@ -62,9 +61,6 @@ public class ResourceFilterFactory { public static final String RESOURCE_CONFIGURATION_FILTERS_NAME = "resource_configuration_filters"; public static final String DENSITIES_NAME = "densities"; - public static final ObjectCodec<ResourceFilterFactory> CODEC = - new ResourceFilterFactory_AutoCodec(); - /** * Locales used for pseudolocation. * diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java index bd7a0b78d8..09d8bfb14c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.rules.apple.AppleConfiguration.ConfigurationDistinguisher; import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; import com.google.devtools.build.lib.skyframe.serialization.DeserializationContext; -import com.google.devtools.build.lib.skyframe.serialization.EnumCodec; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.SerializationContext; import com.google.devtools.build.lib.skyframe.serialization.SerializationException; @@ -486,8 +485,6 @@ public class AppleCommandLineOptions extends FragmentOptions { super(AppleBitcodeMode.class, "apple bitcode mode"); } } - - static final EnumCodec<AppleBitcodeMode> CODEC = new EnumCodec<>(AppleBitcodeMode.class); } @Override @@ -512,12 +509,12 @@ public class AppleCommandLineOptions extends FragmentOptions { void serialize(SerializationContext context, CodedOutputStream out) throws IOException, SerializationException { - CODEC.serialize(context, this, out); + context.serialize(this, out); } static AppleCommandLineOptions deserialize(DeserializationContext context, CodedInputStream in) throws IOException, SerializationException { - return CODEC.deserialize(context, in); + return context.deserialize(in); } /** Converter for the Apple configuration distinguisher. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java index eaccc1eff9..55b9b01a1e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java @@ -31,8 +31,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions.AppleBitcodeMode; import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; -import com.google.devtools.build.lib.skyframe.serialization.EnumCodec; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -50,8 +48,6 @@ import javax.annotation.Nullable; ) @Immutable public class AppleConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<AppleConfiguration> CODEC = new AppleConfiguration_AutoCodec(); - /** * Environment variable name for the xcode version. The value of this environment variable should * be set to the version (for example, "7.2") of xcode to use when invoking part of the apple @@ -568,8 +564,5 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { public String getFileSystemName() { return fileSystemName; } - - static final EnumCodec<ConfigurationDistinguisher> CODEC = - new EnumCodec<>(ConfigurationDistinguisher.class); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java index 0a446da63c..cc8fb96b30 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.packages.Provider; import com.google.devtools.build.lib.packages.SkylarkInfo; -import com.google.devtools.build.lib.skyframe.serialization.EnumCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; @@ -315,7 +314,5 @@ public enum ApplePlatform implements SkylarkValue { public void repr(SkylarkPrinter printer) { printer.append(toString()); } - - static final EnumCodec<PlatformType> CODEC = new EnumCodec<>(PlatformType.class); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java index 505838754d..12bf90edad 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.apple.swift; import com.google.devtools.build.lib.analysis.config.FragmentOptions; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; @@ -25,9 +24,6 @@ import java.util.List; /** Command-line options for building with Swift tools. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class SwiftCommandLineOptions extends FragmentOptions { - public static final ObjectCodec<SwiftCommandLineOptions> CODEC = - new SwiftCommandLineOptions_AutoCodec(); - @Option( name = "swiftcopt", allowMultiple = true, diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java index 06976f3f5b..5794bcd558 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactor import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -41,8 +40,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; ) @Immutable public class SwiftConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<SwiftConfiguration> CODEC = new SwiftConfiguration_AutoCodec(); - private final boolean enableWholeModuleOptimization; private final ImmutableList<String> copts; diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagConfiguration.java index 8ff00a46d7..0103056d0b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagConfiguration.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.Option; @@ -43,9 +42,6 @@ import javax.annotation.Nullable; */ @AutoCodec public final class ConfigFeatureFlagConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<ConfigFeatureFlagConfiguration> CODEC = - new ConfigFeatureFlagConfiguration_AutoCodec(); - /** A converter used by the flag options which always returns an empty map, ignoring input. */ public static final class EmptyImmutableSortedMapConverter implements Converter<ImmutableSortedMap<Label, String>> { @@ -63,9 +59,6 @@ public final class ConfigFeatureFlagConfiguration extends BuildConfiguration.Fra /** The options fragment which defines {@link ConfigFeatureFlagConfiguration}. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public static final class Options extends FragmentOptions { - public static final ObjectCodec<Options> CODEC = - new ConfigFeatureFlagConfiguration_Options_AutoCodec(); - /** The mapping from config_feature_flag rules to their values. */ @Option( name = "config_feature_flag values (private)", diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index d03fbecf15..ac9abc2321 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -51,7 +51,6 @@ import com.google.devtools.build.lib.rules.cpp.CppConfiguration.DynamicMode; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode; import com.google.devtools.build.lib.rules.cpp.FdoSupport.FdoMode; import com.google.devtools.build.lib.shell.ShellUtils; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.syntax.Type; @@ -404,8 +403,6 @@ public final class CcCommon { /** A filter that removes copts from a c++ compile action according to a nocopts regex. */ @AutoCodec static class CoptsFilter { - public static final ObjectCodec<CoptsFilter> CODEC = new CcCommon_CoptsFilter_AutoCodec(); - private final Pattern noCoptsPattern; private final boolean allPasses; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java index aa600274b4..c51a781f63 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.rules.cpp.CppHelper.PregreppedHeader; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.vfs.PathFragment; @@ -48,8 +47,6 @@ import javax.annotation.Nullable; @Immutable @AutoCodec public final class CcCompilationInfo extends NativeInfo { - public static final ObjectCodec<CcCompilationInfo> CODEC = new CcCompilationInfo_AutoCodec(); - public static final NativeProvider<CcCompilationInfo> PROVIDER = new NativeProvider<CcCompilationInfo>(CcCompilationInfo.class, "CcCompilationInfo") {}; @@ -359,9 +356,6 @@ public final class CcCompilationInfo extends NativeInfo { @AutoCodec @VisibleForSerialization static class CommandLineCcCompilationInfo { - public static final ObjectCodec<CommandLineCcCompilationInfo> CODEC = - new CcCompilationInfo_CommandLineCcCompilationInfo_AutoCodec(); - private final ImmutableList<PathFragment> includeDirs; private final ImmutableList<PathFragment> quoteIncludeDirs; private final ImmutableList<PathFragment> systemIncludeDirs; @@ -765,9 +759,6 @@ public final class CcCompilationInfo extends NativeInfo { @Immutable @AutoCodec public static final class ModuleInfo { - public static final ObjectCodec<ModuleInfo> CODEC = - new CcCompilationInfo_ModuleInfo_AutoCodec(); - /** * The module built for this context. If null, then no module is being compiled for this * context. @@ -901,9 +892,6 @@ public final class CcCompilationInfo extends NativeInfo { @Immutable @AutoCodec public static final class TransitiveModuleHeaders { - public static final ObjectCodec<TransitiveModuleHeaders> CODEC = - new CcCompilationInfo_TransitiveModuleHeaders_AutoCodec(); - /** * The module that we are calculating information for. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcExecutionDynamicLibrariesProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcExecutionDynamicLibrariesProvider.java index e8fd432458..6ae1acf65e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcExecutionDynamicLibrariesProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcExecutionDynamicLibrariesProvider.java @@ -19,16 +19,12 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** A target that provides the execution-time dynamic libraries of a C++ rule. */ @Immutable @AutoCodec public final class CcExecutionDynamicLibrariesProvider implements TransitiveInfoProvider { - public static final ObjectCodec<CcExecutionDynamicLibrariesProvider> CODEC = - new CcExecutionDynamicLibrariesProvider_AutoCodec(); - public static final CcExecutionDynamicLibrariesProvider EMPTY = new CcExecutionDynamicLibrariesProvider( NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER)); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java index 81b304f55f..731357c4cd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.rules.cpp.LinkerInputs.LibraryToLink; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import java.util.Collection; @@ -45,8 +44,6 @@ import javax.annotation.Nullable; */ @AutoCodec public final class CcLinkParams { - public static final ObjectCodec<CcLinkParams> CODEC = new CcLinkParams_AutoCodec(); - /** * A list of link options contributed by a single configured target. * @@ -398,8 +395,6 @@ public final class CcLinkParams { */ @AutoCodec public static final class Linkstamp { - public static final ObjectCodec<Linkstamp> CODEC = new CcLinkParams_Linkstamp_AutoCodec(); - private final Artifact artifact; private final NestedSet<Artifact> declaredIncludeSrcs; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java index 3c5554d66e..eb8b78847b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsInfo.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.rules.cpp.CcLinkParams.Builder; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore.CcLinkParamsStoreImpl; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; @@ -29,8 +28,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec. @Immutable @AutoCodec public final class CcLinkParamsInfo extends NativeInfo { - public static final ObjectCodec<CcLinkParamsInfo> CODEC = new CcLinkParamsInfo_AutoCodec(); - public static final NativeProvider<CcLinkParamsInfo> PROVIDER = new NativeProvider<CcLinkParamsInfo>(CcLinkParamsInfo.class, "link_params") {}; public static final Function<TransitiveInfoCollection, CcLinkParamsStore> TO_LINK_PARAMS = @@ -54,9 +51,6 @@ public final class CcLinkParamsInfo extends NativeInfo { @AutoCodec @VisibleForSerialization static class CcLinkParamsInfoCollection extends CcLinkParamsStore { - public static final ObjectCodec<CcLinkParamsInfoCollection> CODEC = - new CcLinkParamsInfo_CcLinkParamsInfoCollection_AutoCodec(); - private final Iterable<CcLinkParamsInfo> providers; CcLinkParamsInfoCollection(Iterable<CcLinkParamsInfo> providers) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcNativeLibraryProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcNativeLibraryProvider.java index e8f757fc71..b88be07d17 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcNativeLibraryProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcNativeLibraryProvider.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** @@ -27,9 +26,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @Immutable @AutoCodec public final class CcNativeLibraryProvider implements TransitiveInfoProvider { - public static final ObjectCodec<CcNativeLibraryProvider> CODEC = - new CcNativeLibraryProvider_AutoCodec(); - private final NestedSet<LinkerInput> transitiveCcNativeLibraries; public CcNativeLibraryProvider(NestedSet<LinkerInput> transitiveCcNativeLibraries) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java index 5664286168..a63712ee65 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.util.Pair; @@ -131,10 +130,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class StringLiteralChunk implements StringChunk, Serializable { - - public static final ObjectCodec<StringLiteralChunk> CODEC = - new CcToolchainFeatures_StringLiteralChunk_AutoCodec(); - private final String text; @VisibleForSerialization @@ -169,9 +164,6 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec static class VariableChunk implements StringChunk, Serializable { - public static final ObjectCodec<VariableChunk> CODEC = - new CcToolchainFeatures_VariableChunk_AutoCodec(); - private final String variableName; @VisibleForSerialization @@ -346,9 +338,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class Flag implements Serializable, Expandable { - - public static final ObjectCodec<Flag> CODEC = new CcToolchainFeatures_Flag_AutoCodec(); - private final ImmutableList<StringChunk> chunks; @VisibleForSerialization @@ -397,9 +386,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class SingleChunkFlag implements Serializable, Expandable { - public static final ObjectCodec<SingleChunkFlag> CODEC = - new CcToolchainFeatures_Flag_SingleChunkFlag_AutoCodec(); - private final StringChunk chunk; @VisibleForSerialization @@ -439,9 +425,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class EnvEntry implements Serializable { - - public static final ObjectCodec<EnvEntry> CODEC = new CcToolchainFeatures_EnvEntry_AutoCodec(); - private final String key; private final ImmutableList<StringChunk> valueChunks; @@ -493,10 +476,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class VariableWithValue { - - public static final ObjectCodec<VariableWithValue> CODEC = - new CcToolchainFeatures_VariableWithValue_AutoCodec(); - public final String variable; public final String value; @@ -514,10 +493,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class FlagGroup implements Serializable, Expandable { - - public static final ObjectCodec<FlagGroup> CODEC = - new CcToolchainFeatures_FlagGroup_AutoCodec(); - private final ImmutableList<Expandable> expandables; private String iterateOverVariable; private final ImmutableSet<String> expandIfAllAvailable; @@ -709,14 +684,11 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class FlagSet implements Serializable { - - public static final ObjectCodec<FlagSet> CODEC = new CcToolchainFeatures_FlagSet_AutoCodec(); - private final ImmutableSet<String> actions; private final ImmutableSet<String> expandIfAllAvailable; private final ImmutableSet<CToolchain.WithFeatureSet> withFeatureSets; private final ImmutableList<FlagGroup> flagGroups; - + private FlagSet(CToolchain.FlagSet flagSet) throws InvalidConfigurationException { this(flagSet, ImmutableSet.copyOf(flagSet.getActionList())); } @@ -795,9 +767,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class EnvSet implements Serializable { - - public static final ObjectCodec<EnvSet> CODEC = new CcToolchainFeatures_EnvSet_AutoCodec(); - private final ImmutableSet<String> actions; private final ImmutableList<EnvEntry> envEntries; private final ImmutableSet<CToolchain.WithFeatureSet> withFeatureSets; @@ -882,9 +851,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static class Feature implements Serializable, CrosstoolSelectable { - - public static final ObjectCodec<Feature> CODEC = new CcToolchainFeatures_Feature_AutoCodec(); - private final String name; private final ImmutableList<FlagSet> flagSets; private final ImmutableList<EnvSet> envSets; @@ -1017,10 +983,6 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec static class ActionConfig implements Serializable, CrosstoolSelectable { - - public static final ObjectCodec<ActionConfig> CODEC = - new CcToolchainFeatures_ActionConfig_AutoCodec(); - public static final String FLAG_SET_WITH_ACTION_ERROR = "action_config %s specifies actions. An action_config's flag sets automatically apply " + "to the configured action. Thus, you must not specify action lists in an " @@ -1166,9 +1128,6 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec public static class Variables { - public static final ObjectCodec<Variables> CODEC = - new CcToolchainFeatures_Variables_AutoCodec(); - /** An empty variables instance. */ public static final Variables EMPTY = new Variables.Builder().build(); @@ -1376,9 +1335,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static final class LazyStringSequence extends VariableValueAdapter { - public static final ObjectCodec<LazyStringSequence> CODEC = - new CcToolchainFeatures_Variables_LazyStringSequence_AutoCodec(); - private final Supplier<ImmutableList<String>> supplier; @VisibleForSerialization @@ -1414,9 +1370,6 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec public static class LibraryToLinkValue extends VariableValueAdapter { - public static final ObjectCodec<LibraryToLinkValue> CODEC = - new CcToolchainFeatures_Variables_LibraryToLinkValue_AutoCodec(); - public static final String OBJECT_FILES_FIELD_NAME = "object_files"; public static final String NAME_FIELD_NAME = "name"; public static final String TYPE_FIELD_NAME = "type"; @@ -1548,9 +1501,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static final class Sequence extends VariableValueAdapter { - public static final ObjectCodec<Sequence> CODEC = - new CcToolchainFeatures_Variables_Sequence_AutoCodec(); - private static final String SEQUENCE_VARIABLE_TYPE_NAME = "sequence"; private final ImmutableList<VariableValue> values; @@ -1584,9 +1534,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static final class StructureSequence extends VariableValueAdapter { - public static final ObjectCodec<StructureSequence> CODEC = - new CcToolchainFeatures_Variables_StructureSequence_AutoCodec(); - private final ImmutableList<ImmutableMap<String, VariableValue>> values; @VisibleForSerialization @@ -1623,9 +1570,6 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec static final class StringSequence extends VariableValueAdapter { - public static final ObjectCodec<StringSequence> CODEC = - new CcToolchainFeatures_Variables_StringSequence_AutoCodec(); - private final Iterable<String> values; public StringSequence(Iterable<String> values) { @@ -1661,9 +1605,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static final class StructureValue extends VariableValueAdapter { - public static final ObjectCodec<StructureValue> CODEC = - new CcToolchainFeatures_Variables_StructureValue_AutoCodec(); - private static final String STRUCTURE_VARIABLE_TYPE_NAME = "structure"; private final ImmutableMap<String, VariableValue> value; @@ -1701,9 +1642,6 @@ public class CcToolchainFeatures implements Serializable { @AutoCodec @VisibleForSerialization static final class StringValue extends VariableValueAdapter { - public static final ObjectCodec<StringValue> CODEC = - new CcToolchainFeatures_Variables_StringValue_AutoCodec(); - private static final String STRING_VARIABLE_TYPE_NAME = "string"; private final String value; @@ -1737,9 +1675,6 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec static final class IntegerValue extends VariableValueAdapter { - public static final ObjectCodec<IntegerValue> CODEC = - new CcToolchainFeatures_Variables_IntegerValue_AutoCodec(); - private static final String INTEGER_VALUE_TYPE_NAME = "integer"; private final int value; @@ -2087,14 +2022,10 @@ public class CcToolchainFeatures implements Serializable { @Immutable @AutoCodec public static class FeatureConfiguration { - - public static final ObjectCodec<FeatureConfiguration> CODEC = - new CcToolchainFeatures_FeatureConfiguration_AutoCodec(); - private final ImmutableSet<String> enabledFeatureNames; private final ImmutableList<Feature> enabledFeatures; private final ImmutableSet<String> enabledActionConfigActionNames; - + private final ImmutableMap<String, ActionConfig> actionConfigByActionName; /** @@ -2114,7 +2045,7 @@ public class CcToolchainFeatures implements Serializable { ImmutableSet<String> enabledActionConfigActionNames, ImmutableMap<String, ActionConfig> actionConfigByActionName) { this.enabledFeatures = enabledFeatures; - + this.actionConfigByActionName = actionConfigByActionName; ImmutableSet.Builder<String> featureBuilder = ImmutableSet.builder(); for (Feature feature : enabledFeatures) { @@ -2123,7 +2054,7 @@ public class CcToolchainFeatures implements Serializable { this.enabledFeatureNames = featureBuilder.build(); this.enabledActionConfigActionNames = enabledActionConfigActionNames; } - + /** * @return whether the given {@code feature} is enabled. */ @@ -2196,7 +2127,7 @@ public class CcToolchainFeatures implements Serializable { } return envBuilder.build(); } - + /** * Returns a given action's tool under this FeatureConfiguration. */ @@ -2237,7 +2168,7 @@ public class CcToolchainFeatures implements Serializable { /** All artifact name patterns defined in this feature configuration. */ private final ImmutableList<ArtifactNamePattern> artifactNamePatterns; - + /** * All features and action configs in the order in which they were specified in the configuration. * diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java index 76d9e47223..af40a0b39f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.rules.cpp.CcCommon.CoptsFilter; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; import com.google.devtools.build.lib.rules.cpp.CppCompileAction.DotdFile; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.util.Pair; @@ -34,8 +33,6 @@ import javax.annotation.Nullable; /** The compile command line for the C++ compile action. */ @AutoCodec public final class CompileCommandLine { - public static final ObjectCodec<CompileCommandLine> CODEC = new CompileCommandLine_AutoCodec(); - private final Artifact sourceFile; private final CoptsFilter coptsFilter; private final FeatureConfiguration featureConfiguration; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 236439e93c..256b459afd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -57,7 +57,6 @@ import com.google.devtools.build.lib.rules.cpp.CcCommon.CoptsFilter; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CppCompileActionContext.Reply; import com.google.devtools.build.lib.rules.cpp.CppHelper.PregreppedHeader; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.util.DependencySet; @@ -90,8 +89,6 @@ import javax.annotation.Nullable; @ThreadCompatible public class CppCompileAction extends AbstractAction implements IncludeScannable, ExecutionInfoSpecifier, CommandAction { - public static final ObjectCodec<CppCompileAction> CODEC = new CppCompileAction_AutoCodec(); - private static final PathFragment BUILD_PATH_FRAGMENT = PathFragment.create("BUILD"); private static final int VALIDATION_DEBUG = 0; // 0==none, 1==warns/errors, 2==all @@ -1401,8 +1398,6 @@ public class CppCompileAction extends AbstractAction */ @AutoCodec public static class DotdFile { - public static final ObjectCodec<DotdFile> CODEC = new CppCompileAction_DotdFile_AutoCodec(); - private final Artifact artifact; private final PathFragment execPath; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index e0b1e53a0b..75f123b677 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -41,7 +41,6 @@ import com.google.devtools.build.lib.rules.cpp.CppConfigurationLoader.CppConfigu import com.google.devtools.build.lib.rules.cpp.CrosstoolConfigurationLoader.CrosstoolFile; import com.google.devtools.build.lib.rules.cpp.transitions.ContextCollectorOwnerTransition; import com.google.devtools.build.lib.rules.cpp.transitions.DisableLipoTransition; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -67,8 +66,6 @@ import javax.annotation.Nullable; ) @Immutable public final class CppConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<CppConfiguration> CODEC = new CppConfiguration_AutoCodec(); - /** * String indicating a Mac system, for example when used in a crosstool configuration's host or * target system name. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugFileProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugFileProvider.java index 4afbd08be9..5b1ec70bd3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugFileProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugFileProvider.java @@ -17,7 +17,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** @@ -27,9 +26,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @Immutable @AutoCodec public final class CppDebugFileProvider implements TransitiveInfoProvider { - public static final ObjectCodec<CppDebugFileProvider> CODEC = - new CppDebugFileProvider_AutoCodec(); - private final NestedSet<Artifact> transitiveDwoFiles; private final NestedSet<Artifact> transitivePicDwoFiles; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java index 03f666e48b..31d3f9d81f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppDebugPackageProvider.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import javax.annotation.Nullable; @@ -30,9 +29,6 @@ import javax.annotation.Nullable; @Immutable @AutoCodec public final class CppDebugPackageProvider implements TransitiveInfoProvider { - public static final ObjectCodec<CppDebugPackageProvider> CODEC = - new CppDebugPackageProvider_AutoCodec(); - private final Label targetLabel; private final Artifact strippedArtifact; private final Artifact unstrippedArtifact; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index be411909f5..0aa8e4de93 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -65,7 +65,6 @@ import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.DynamicMode; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; import com.google.devtools.build.lib.shell.ShellUtils; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.FileTypeSet; @@ -574,9 +573,6 @@ public class CppHelper { @AutoCodec @AutoValue abstract static class PregreppedHeader { - public static final ObjectCodec<PregreppedHeader> CODEC = - new CppHelper_PregreppedHeader_AutoCodec(); - @AutoCodec.Instantiator static PregreppedHeader create(Artifact originalHeader, Artifact greppedHeader) { return new AutoValue_CppHelper_PregreppedHeader(originalHeader, greppedHeader); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java index 1e158882ac..ac13b850a6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.common.base.Optional; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; @@ -24,8 +23,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec. @Immutable @AutoCodec public final class CppModuleMap { - public static final ObjectCodec<CppModuleMap> CODEC = new CppModuleMap_AutoCodec(); - // NOTE: If you add a field here, you'll likely need to update CppModuleMapAction.computeKey(). private final Artifact artifact; private final String name; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index 54ee2a97f1..d193589a2d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.DynamicMode; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.StripMode; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.util.OS; import com.google.devtools.build.lib.util.OptionsUtils; @@ -47,8 +46,6 @@ import javax.annotation.Nullable; /** Command-line options for C++. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class CppOptions extends FragmentOptions { - public static final ObjectCodec<CppOptions> CODEC = new CppOptions_AutoCodec(); - /** * Converts a comma-separated list of compilation mode settings to a properly typed List. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRunfilesProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRunfilesProvider.java index e5f48e04df..9eccbf6b99 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRunfilesProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRunfilesProvider.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** @@ -31,7 +30,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @Immutable @AutoCodec public final class CppRunfilesProvider implements TransitiveInfoProvider { - public static final ObjectCodec<CppRunfilesProvider> CODEC = new CppRunfilesProvider_AutoCodec(); private final Runfiles staticRunfiles; private final Runfiles sharedRunfiles; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java index 91f95020b8..4eb49ed6af 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java @@ -29,7 +29,6 @@ import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.rules.cpp.CppActionConfigs.CppPlatform; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.Tool; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; 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; @@ -59,8 +58,6 @@ import java.util.Set; @AutoCodec @Immutable public final class CppToolchainInfo { - public static final ObjectCodec<CppToolchainInfo> CODEC = new CppToolchainInfo_AutoCodec(); - private CToolchain toolchain; private final PathFragment crosstoolTopPathFragment; private final String toolchainIdentifier; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java index 07e722a0d7..a57dd7312b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java @@ -31,7 +31,6 @@ import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.Fingerprint; @@ -70,9 +69,6 @@ public class CrosstoolConfigurationLoader { /** A class that holds the results of reading a CROSSTOOL file. */ @AutoCodec public static class CrosstoolFile { - public static final ObjectCodec<CrosstoolFile> CODEC = - new CrosstoolConfigurationLoader_CrosstoolFile_AutoCodec(); - private final String location; private final CrosstoolConfig.CrosstoolRelease proto; private final String md5; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java index 4684a7d6e7..8b1c729c06 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.common.collect.Lists; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import java.util.Collection; @@ -31,9 +30,6 @@ import java.util.Map; */ @AutoCodec public final class ExtraLinkTimeLibraries { - public static final ObjectCodec<ExtraLinkTimeLibraries> CODEC = - new ExtraLinkTimeLibraries_AutoCodec(); - /** * We can have multiple different kinds of lists of libraries to include * at link time. We map from the class type to an actual instance. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportProvider.java index 4050422836..72715f02ba 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportProvider.java @@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.PathFragment; @@ -28,8 +27,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; @Immutable @AutoCodec public class FdoSupportProvider implements TransitiveInfoProvider { - public static final ObjectCodec<FdoSupportProvider> CODEC = new FdoSupportProvider_AutoCodec(); - private final FdoSupport fdoSupport; private final Artifact profileArtifact; private final ImmutableMap<PathFragment, Artifact> gcdaArtifacts; 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 da8c79d761..7938c99f62 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 @@ -17,7 +17,6 @@ import com.google.common.collect.Interner; import com.google.devtools.build.lib.concurrent.BlazeInterners; 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.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; @@ -45,7 +44,6 @@ public class FdoSupportValue implements SkyValue { @AutoCodec public static class Key implements SkyKey { private static final Interner<Key> interner = BlazeInterners.newWeakInterner(); - public static final ObjectCodec<Key> CODEC = new FdoSupportValue_Key_AutoCodec(); private final LipoMode lipoMode; private final Path fdoZip; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FlagList.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FlagList.java index ef992520b9..976914135c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FlagList.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FlagList.java @@ -18,7 +18,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain; import java.io.Serializable; @@ -28,14 +27,10 @@ import java.util.List; @AutoCodec @Immutable public class FlagList implements Serializable { - public static final ObjectCodec<FlagList> CODEC = new FlagList_AutoCodec(); - /** Represents an optional flag that can be toggled using the package features mechanism. */ @AutoCodec @Immutable static class OptionalFlag implements Serializable { - public static final ObjectCodec<OptionalFlag> CODEC = new FlagList_OptionalFlag_AutoCodec(); - private final String name; private final ImmutableList<String> flags; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java index 8625cf6cd9..a71c384a0f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java @@ -20,7 +20,6 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.CollectionUtils; import com.google.devtools.build.lib.concurrent.ThreadSafety; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; @@ -35,9 +34,6 @@ public abstract class LinkerInputs { @ThreadSafety.Immutable @AutoCodec public static class SimpleLinkerInput implements LinkerInput { - public static final ObjectCodec<SimpleLinkerInput> CODEC = - new LinkerInputs_SimpleLinkerInput_AutoCodec(); - private final Artifact artifact; private final ArtifactCategory category; @@ -175,9 +171,6 @@ public abstract class LinkerInputs { @ThreadSafety.Immutable @AutoCodec public static class SolibLibraryToLink implements LibraryToLink { - public static final ObjectCodec<SolibLibraryToLink> CODEC = - new LinkerInputs_SolibLibraryToLink_AutoCodec(); - private final Artifact solibSymlinkArtifact; private final Artifact libraryArtifact; private final String libraryIdentifier; @@ -278,9 +271,6 @@ public abstract class LinkerInputs { @AutoCodec @VisibleForSerialization static class CompoundLibraryToLink implements LibraryToLink { - public static final ObjectCodec<CompoundLibraryToLink> CODEC = - new LinkerInputs_CompoundLibraryToLink_AutoCodec(); - private final Artifact libraryArtifact; private final ArtifactCategory category; private final String libraryIdentifier; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LipoContextProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LipoContextProvider.java index 26541d624c..bf3771718e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LipoContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LipoContextProvider.java @@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.Map; @@ -34,8 +33,6 @@ import java.util.Map; @Immutable @AutoCodec public final class LipoContextProvider implements TransitiveInfoProvider { - public static final ObjectCodec<LipoContextProvider> CODEC = new LipoContextProvider_AutoCodec(); - private final CcCompilationInfo ccCompilationInfo; private final ImmutableMap<Artifact, IncludeScannable> includeScannables; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java index 2dc2996484..cb26f91b43 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.Tool; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -54,8 +53,6 @@ import java.util.Map; */ @AutoCodec public final class LtoBackendArtifacts { - public static final ObjectCodec<LtoBackendArtifacts> CODEC = new LtoBackendArtifacts_AutoCodec(); - // A file containing mapping of symbol => bitcode file containing the symbol. private final Artifact index; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java index 650f3eda53..e07ce2e95f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/TransitiveLipoInfoProvider.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** @@ -32,9 +31,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @Immutable @AutoCodec public final class TransitiveLipoInfoProvider implements TransitiveInfoProvider { - public static final ObjectCodec<TransitiveLipoInfoProvider> CODEC = - new TransitiveLipoInfoProvider_AutoCodec(); - public static final String LIPO_CONTEXT_COLLECTOR = ":lipo_context_collector"; public static final TransitiveLipoInfoProvider EMPTY = new TransitiveLipoInfoProvider( diff --git a/src/main/java/com/google/devtools/build/lib/rules/filegroup/FilegroupPathProvider.java b/src/main/java/com/google/devtools/build/lib/rules/filegroup/FilegroupPathProvider.java index 35447dc223..53566f3cad 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/filegroup/FilegroupPathProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/filegroup/FilegroupPathProvider.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.filegroup; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.PathFragment; @@ -24,9 +23,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; @Immutable @AutoCodec public final class FilegroupPathProvider implements TransitiveInfoProvider { - public static final ObjectCodec<FilegroupPathProvider> CODEC = - new FilegroupPathProvider_AutoCodec(); - private final PathFragment pathFragment; @AutoCodec.Instantiator diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java index e81118d36a..2d1eb2e0ec 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java @@ -28,7 +28,6 @@ import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -47,8 +46,6 @@ import javax.annotation.Nullable; category = SkylarkModuleCategory.CONFIGURATION_FRAGMENT ) public final class JavaConfiguration extends Fragment { - public static final ObjectCodec<JavaConfiguration> CODEC = new JavaConfiguration_AutoCodec(); - /** Values for the --java_classpath option */ public enum JavaClasspathMode { /** Use full transitive classpaths, the default behavior. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java index e9c6fb2bb1..3e9484d7e2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode; import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaOptimizationMode; import com.google.devtools.build.lib.rules.java.JavaConfiguration.OneVersionEnforcementLevel; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; @@ -41,8 +40,6 @@ import java.util.Set; /** Command-line options for building Java targets */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class JavaOptions extends FragmentOptions { - public static final ObjectCodec<JavaOptions> CODEC = new JavaOptions_AutoCodec(); - /** Converter for the --java_classpath option. */ public static class JavaClasspathModeConverter extends EnumConverter<JavaClasspathMode> { public JavaClasspathModeConverter() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java index dba496bb4d..0e8c1b6e89 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.packages.RuleErrorConsumer; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -37,8 +36,6 @@ import javax.annotation.Nullable; @Immutable @AutoCodec public class JavaRuntimeInfo extends NativeInfo { - public static final ObjectCodec<JavaRuntimeInfo> CODEC = new JavaRuntimeInfo_AutoCodec(); - public static final String SKYLARK_NAME = "JavaRuntimeInfo"; public static final NativeProvider<JavaRuntimeInfo> PROVIDER = diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java index e44bdac30d..855dd0c27a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; import com.google.devtools.build.lib.concurrent.ThreadSafety; import com.google.devtools.build.lib.events.Location; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** @@ -28,8 +27,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @ThreadSafety.Immutable @AutoCodec public final class JavaRuntimeToolchainInfo extends ToolchainInfo { - public static final ObjectCodec<JavaRuntimeToolchainInfo> CODEC = - new JavaRuntimeToolchainInfo_AutoCodec(); private final JavaRuntimeInfo javaRuntime; @AutoCodec.Instantiator diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java b/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java index 3291a405f4..418cfd4010 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.rules.cpp.CppCompileAction; import com.google.devtools.build.lib.rules.cpp.IncludeProcessing; import com.google.devtools.build.lib.rules.cpp.IncludeScanner.IncludeScannerSupplier; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.PathFragment; @@ -46,8 +45,6 @@ import javax.annotation.Nullable; */ @AutoCodec public class HeaderThinning implements IncludeProcessing { - public static final ObjectCodec<HeaderThinning> CODEC = new HeaderThinning_AutoCodec(); - private final Iterable<Artifact> potentialInputs; public HeaderThinning(Iterable<Artifact> potentialInputs) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java index ba28c3657e..2e0b812387 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.rules.objc; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Converters; import com.google.devtools.common.options.Option; @@ -31,9 +30,6 @@ import java.util.List; */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class J2ObjcCommandLineOptions extends FragmentOptions { - public static final ObjectCodec<J2ObjcCommandLineOptions> CODEC = - new J2ObjcCommandLineOptions_AutoCodec(); - @Option( name = "j2objc_translation_flags", converter = Converters.CommaSeparatedOptionListConverter.class, diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java index 582453b982..d71ce599c9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import java.util.Collections; import java.util.List; @@ -40,8 +39,6 @@ import java.util.List; @AutoCodec @Immutable public class J2ObjcConfiguration extends Fragment { - public static final ObjectCodec<J2ObjcConfiguration> CODEC = new J2ObjcConfiguration_AutoCodec(); - /** * Always-on flags for J2ObjC translation. These flags are always used when invoking the J2ObjC * transpiler, and cannot be overridden by user-specified flags in {@link diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index c836e345fe..e7e5a1639d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.rules.apple.DottedVersion; import com.google.devtools.build.lib.rules.apple.DottedVersionConverter; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter; import com.google.devtools.common.options.Option; @@ -31,9 +30,6 @@ import java.util.List; /** Command-line options for building Objective-C targets. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class ObjcCommandLineOptions extends FragmentOptions { - public static final ObjectCodec<ObjcCommandLineOptions> CODEC = - new ObjcCommandLineOptions_AutoCodec(); - @Option( name = "ios_simulator_version", defaultValue = "9.3", diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java index d95e40ca7c..b5d532a100 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; import com.google.devtools.build.lib.rules.apple.DottedVersion; import com.google.devtools.build.lib.rules.cpp.HeaderDiscovery; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -40,8 +39,6 @@ import javax.annotation.Nullable; ) @Immutable public class ObjcConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<ObjcConfiguration> CODEC = new ObjcConfiguration_AutoCodec(); - @VisibleForTesting static final ImmutableList<String> DBG_COPTS = ImmutableList.of("-O0", "-DDEBUG=1", "-fstack-protector", "-fstack-protector-all", "-g"); diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index 2838f3a6c1..1e2db33d31 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; @@ -48,13 +47,9 @@ import java.util.List; doc = "A configuration fragment representing protocol buffers." ) public class ProtoConfiguration extends Fragment { - public static final ObjectCodec<ProtoConfiguration> CODEC = new ProtoConfiguration_AutoCodec(); - /** Command line options. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public static class Options extends FragmentOptions { - public static final ObjectCodec<Options> CODEC = new ProtoConfiguration_Options_AutoCodec(); - @Option( name = "protocopt", allowMultiple = true, diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfiguration.java index f8ac8bc2c3..b152c7a745 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfiguration.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.util.OS; import com.google.devtools.common.options.TriState; @@ -34,8 +33,6 @@ import java.util.List; @AutoCodec @Immutable public class PythonConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<PythonConfiguration> CODEC = new PythonConfiguration_AutoCodec(); - private final boolean ignorePythonVersionAttribute; private final PythonVersion defaultPythonVersion; private final TriState buildPythonZip; diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java index b730513300..8138485d47 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.python; import com.google.devtools.build.lib.analysis.config.FragmentOptions; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; @@ -25,8 +24,6 @@ import com.google.devtools.common.options.TriState; /** Python-related command-line options. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class PythonOptions extends FragmentOptions { - public static final ObjectCodec<PythonOptions> CODEC = new PythonOptions_AutoCodec(); - /** * Converter for the --force_python option. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java index 6d443cdbb2..39d88abd99 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.vfs.PathFragment; @@ -42,9 +41,6 @@ public final class PythonUtils { @AutoCodec static class GetInitPyFiles implements Runfiles.EmptyFilesSupplier { - public static final ObjectCodec<GetInitPyFiles> CODEC = - new PythonUtils_GetInitPyFiles_AutoCodec(); - @Override public Iterable<PathFragment> getExtraPaths(Set<PathFragment> manifestPaths) { return getInitPyFiles(manifestPaths); |