commit a41e01ee7ed395c4913ff31ed8c2e84297fabe1c
author cpeyser <cpeyser@google.com> Thu Feb 22 09:27:40 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Feb 22 09:29:44 2018 -0800
tree 0ecb5d6a0bd06c0b0ed54c5c4ec4c5981efbde2b
parent ca93b67eb4b2c78e82c6f523ebc2e15acb831683

Add @AutoCodec to SpawnAction. Refactor the SpawnAction API for extra actions so that it is non-generic and does not persist a GeneratedExtension, which is hard to serialize.

PiperOrigin-RevId: 186627440

src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
index c609d3d..89c6741 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImpl.java
@@ -21,6 +21,7 @@
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.BaseSpawn;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.IOException;
 import java.util.Map;
@@ -28,6 +29,7 @@
 
 /** {@link RunfilesSupplier} implementation wrapping a single {@link Runfiles} directory mapping. */
 // TODO(bazel-team): Consider renaming to SingleRunfilesSupplierImpl.
+@AutoCodec
 public class RunfilesSupplierImpl implements RunfilesSupplier {
   private final PathFragment runfilesDir;
   private final Runfiles runfiles;
@@ -60,10 +62,9 @@
    * @param runfiles the runfiles for runilesDir.
    * @param manifest runfiles' associated runfiles manifest artifact, if present.
    */
+  @AutoCodec.Instantiator
   public RunfilesSupplierImpl(
-      PathFragment runfilesDir,
-      Runfiles runfiles,
-      @Nullable Artifact manifest) {
+      PathFragment runfilesDir, Runfiles runfiles, @Nullable Artifact manifest) {
     Preconditions.checkArgument(!runfilesDir.isAbsolute());
     this.runfilesDir = Preconditions.checkNotNull(runfilesDir);
     this.runfiles = Preconditions.checkNotNull(runfiles);