diff options
| author |  shahan <shahan@google.com> | 2018-02-28 09:18:36 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-28 09:20:24 -0800 |
| commit | 1fe23126d4a30d49b7668b235ea1bfb2e2c8a39e (patch) | |
| tree | 7807839ba173ef69dd87e5933f0419767ab327e0 /src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java | |
| parent | e959e44a4363fc12ae2df2c5bc0cd0d12f80bbd9 (diff) | |
Deletes AutoCodec.Strategy.SINGLETON now that we have @AutoCodec field tags.
This also gets rid of some static initialization cycles which we should try very hard to avoid in the future.
PiperOrigin-RevId: 187334087
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java index 933a1a8939..a1f02fa415 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java @@ -33,7 +33,6 @@ import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.BuildType; 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.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -73,8 +72,6 @@ import javax.annotation.Nullable; ) @AutoCodec public final class Runfiles { - public static ObjectCodec<Runfiles> CODEC = new Runfiles_AutoCodec(); - private static final Function<SymlinkEntry, Artifact> TO_ARTIFACT = new Function<SymlinkEntry, Artifact>() { @Override @@ -83,12 +80,9 @@ public final class Runfiles { } }; - @AutoCodec(strategy = Strategy.SINGLETON) @VisibleForSerialization static class DummyEmptyFilesSupplier implements EmptyFilesSupplier { - public static final ObjectCodec<DummyEmptyFilesSupplier> CODEC = - new Runfiles_DummyEmptyFilesSupplier_AutoCodec(); - public static final DummyEmptyFilesSupplier INSTANCE = new DummyEmptyFilesSupplier(); + @AutoCodec public static final DummyEmptyFilesSupplier INSTANCE = new DummyEmptyFilesSupplier(); @Override public Iterable<PathFragment> getExtraPaths(Set<PathFragment> manifestPaths) { |