diff options
author | janakr <janakr@google.com> | 2018-03-23 15:32:18 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-23 15:33:30 -0700 |
commit | f873447a073c8f7374e9f8a74ae42784df3f80e1 (patch) | |
tree | 7d477bd6682951021c0c0a94159f17630c7df0fd /src/main/java | |
parent | 83fe8797a8269fde4f85a117396bbaf6a4390a1c (diff) |
@AutoCodec SelectorList and SkylarkFileType.
PiperOrigin-RevId: 190285424
Diffstat (limited to 'src/main/java')
-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, 13 insertions, 5 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 9fda709fa1..c20d4bcd8a 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,6 +16,7 @@ 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; @@ -33,11 +34,13 @@ 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; - private SkylarkFileType(FileType fileType) { + @AutoCodec.VisibleForSerialization + 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 244d203c8f..4678f630a3 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,6 +17,7 @@ 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; @@ -39,9 +40,12 @@ import java.util.List; * ) * </pre> */ -@SkylarkModule(name = "select", - doc = "A selector between configuration-dependent entities.", - documented = false) +@SkylarkModule( + name = "select", + doc = "A selector between configuration-dependent entities.", + documented = false +) +@AutoCodec 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 @@ -49,7 +53,8 @@ public final class SelectorList implements SkylarkValue { private final Class<?> type; private final List<Object> elements; - private SelectorList(Class<?> type, List<Object> elements) { + @AutoCodec.VisibleForSerialization + SelectorList(Class<?> type, List<Object> elements) { this.type = type; this.elements = elements; } |