diff options
| author |  shahan <shahan@google.com> | 2018-02-13 10:08:47 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-13 10:10:14 -0800 |
| commit | fae34b9ee464186c628c313eebced9e89d8146f6 (patch) | |
| tree | 55d6392acc16aa3c87ada027bf0d92c366c551cc /src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java | |
| parent | a3339c8ca2e824757afe698f591770f4232af530 (diff) | |
Replaces InjectingObjectCodec with dependencies threaded through (Des|S)erializationContext.
PiperOrigin-RevId: 185547740
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java b/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java index 1a84425e61..0e32c867f9 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java @@ -17,7 +17,7 @@ package com.google.devtools.build.lib.actions; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodec; +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.VisibleForSerialization; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter; import com.google.devtools.build.lib.skylarkinterface.SkylarkValue; -import com.google.devtools.build.lib.vfs.FileSystemProvider; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.Root; @@ -56,11 +55,10 @@ import java.util.Objects; + "together into a single directory tree to form the execution environment." ) @Immutable -@AutoCodec(dependency = FileSystemProvider.class) +@AutoCodec public final class ArtifactRoot implements Comparable<ArtifactRoot>, Serializable, SkylarkValue { - public static final InjectingObjectCodec<ArtifactRoot, FileSystemProvider> CODEC = - new ArtifactRoot_AutoCodec(); + public static final ObjectCodec<ArtifactRoot> CODEC = new ArtifactRoot_AutoCodec(); // This must always be consistent with Package.getSourceRoot; otherwise computing source roots // from exec paths does not work, which can break the action cache for input-discovering actions. |