From 20f35b448b5d9d04ba366d74d6bf4c7100d91b63 Mon Sep 17 00:00:00 2001 From: shahan Date: Wed, 28 Feb 2018 15:57:33 -0800 Subject: Deletes CODEC fields now that they are no longer needed. PiperOrigin-RevId: 187397314 --- .../devtools/build/lib/rules/apple/AppleCommandLineOptions.java | 7 ++----- .../google/devtools/build/lib/rules/apple/AppleConfiguration.java | 7 ------- .../com/google/devtools/build/lib/rules/apple/ApplePlatform.java | 3 --- .../build/lib/rules/apple/swift/SwiftCommandLineOptions.java | 4 ---- .../devtools/build/lib/rules/apple/swift/SwiftConfiguration.java | 3 --- 5 files changed, 2 insertions(+), 22 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple') 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 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 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 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 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 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 CODEC = new SwiftConfiguration_AutoCodec(); - private final boolean enableWholeModuleOptimization; private final ImmutableList copts; -- cgit v1.2.3