diff options
author | 2018-03-26 02:31:01 -0700 | |
---|---|---|
committer | 2018-03-26 02:32:14 -0700 | |
commit | 316cd7da6f6b003b853ccf7d144f395a9a557400 (patch) | |
tree | dbb3ce7943ffc98b440f680fc46efc4f235c338c /src/main/java/com/google | |
parent | 504f8b70f931ea930b353e04db819fb547941031 (diff) |
Automated rollback of commit f873447a073c8f7374e9f8a74ae42784df3f80e1.
*** Reason for rollback ***
Breaks proto_library_regtest: http://b/76229470
*** Original change description ***
@AutoCodec SelectorList and SkylarkFileType.
PiperOrigin-RevId: 190434996
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java | 5 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java | 13 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java index c20d4bcd8a..9fda709fa1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.analysis.skylark; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; -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; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; @@ -34,13 +33,11 @@ import java.util.List; "Deprecated. File type for file filtering. Can be used to filter collections of labels " + "for certain file types." ) -@AutoCodec public class SkylarkFileType { private final FileType fileType; - @AutoCodec.VisibleForSerialization - SkylarkFileType(FileType fileType) { + private SkylarkFileType(FileType fileType) { this.fileType = fileType; } diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java b/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java index 4678f630a3..244d203c8f 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java @@ -17,7 +17,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.events.Location; -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.SkylarkPrinter; import com.google.devtools.build.lib.skylarkinterface.SkylarkValue; @@ -40,12 +39,9 @@ import java.util.List; * ) * </pre> */ -@SkylarkModule( - name = "select", - doc = "A selector between configuration-dependent entities.", - documented = false -) -@AutoCodec +@SkylarkModule(name = "select", + doc = "A selector between configuration-dependent entities.", + documented = false) public final class SelectorList implements SkylarkValue { // TODO(build-team): Selectors are currently split between .packages and .syntax . They should // really all be in .packages, but then we'd need to figure out a way how to extend binary @@ -53,8 +49,7 @@ public final class SelectorList implements SkylarkValue { private final Class<?> type; private final List<Object> elements; - @AutoCodec.VisibleForSerialization - SelectorList(Class<?> type, List<Object> elements) { + private SelectorList(Class<?> type, List<Object> elements) { this.type = type; this.elements = elements; } |