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/skyframe/ContainingPackageLookupValue.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/skyframe/ContainingPackageLookupValue.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java index 4454dbe339..24652583fb 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java @@ -28,7 +28,7 @@ import com.google.devtools.build.skyframe.SkyValue; */ public abstract class ContainingPackageLookupValue implements SkyValue { - public static final NoContainingPackage NONE = NoContainingPackage.INSTANCE; + @AutoCodec public static final NoContainingPackage NONE = new NoContainingPackage(); /** Returns whether there is a containing package. */ public abstract boolean hasContainingPackage(); @@ -50,10 +50,7 @@ public abstract class ContainingPackageLookupValue implements SkyValue { } /** Value indicating there is no containing package. */ - @AutoCodec(strategy = AutoCodec.Strategy.SINGLETON) public static class NoContainingPackage extends ContainingPackageLookupValue { - public static final NoContainingPackage INSTANCE = new NoContainingPackage(); - private NoContainingPackage() {} @Override |