From b54f0c5aa5d8f95c7178103fba4ebc545983f6d2 Mon Sep 17 00:00:00 2001
From: janakr <janakr@google.com>
Date: Mon, 5 Mar 2018 08:25:25 -0800
Subject: Automated rollback of commit
 96145511b34a2d7be834e3eb05927674e875c813.

*** Reason for rollback ***

Fixed issue that led to rollback.
RELNOTES: None

*** Original change description ***

Automated rollback of commit eee53d3a33dde441f7e7adaecde81ef2d3db7c1b.

*** Reason for rollback ***

breaks Blaze_CorpTest

*** Original change description ***

@AutoCodec ConfiguredTargetValue.

PiperOrigin-RevId: 187869560
---
 .../build/lib/analysis/SourceManifestAction.java   | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
index 2fc824a10f..a2ba6867df 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
@@ -24,6 +24,8 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.events.EventHandler;
+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.util.Fingerprint;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.BufferedWriter;
@@ -40,15 +42,15 @@ import java.util.Map;
 import javax.annotation.Nullable;
 
 /**
- * Action to create a manifest of input files for processing by a subsequent
- * build step (e.g. runfiles symlinking or archive building).
+ * Action to create a manifest of input files for processing by a subsequent build step (e.g.
+ * runfiles symlinking or archive building).
  *
- * <p>The manifest's format is specifiable by {@link ManifestType}, in
- * accordance with the needs of the calling functionality.
+ * <p>The manifest's format is specifiable by {@link ManifestType}, in accordance with the needs of
+ * the calling functionality.
  *
- * <p>Note that this action carefully avoids building the manifest content in
- * memory.
+ * <p>Note that this action carefully avoids building the manifest content in memory.
  */
+@AutoCodec
 @Immutable // if all ManifestWriter implementations are immutable
 public final class SourceManifestAction extends AbstractFileWriteAction {
 
@@ -93,17 +95,18 @@ public final class SourceManifestAction extends AbstractFileWriteAction {
   private final Runfiles runfiles;
 
   /**
-   * Creates a new AbstractSourceManifestAction instance using latin1 encoding
-   * to write the manifest file and with a specified root path for manifest entries.
+   * Creates a new AbstractSourceManifestAction instance using latin1 encoding to write the manifest
+   * file and with a specified root path for manifest entries.
    *
    * @param manifestWriter the strategy to use to write manifest entries
    * @param owner the action owner
-   * @param output the file to which to write the manifest
+   * @param primaryOutput the file to which to write the manifest
    * @param runfiles runfiles
    */
-  private SourceManifestAction(ManifestWriter manifestWriter, ActionOwner owner, Artifact output,
-      Runfiles runfiles) {
-    super(owner, getDependencies(runfiles), output, false);
+  @VisibleForSerialization
+  SourceManifestAction(
+      ManifestWriter manifestWriter, ActionOwner owner, Artifact primaryOutput, Runfiles runfiles) {
+    super(owner, getDependencies(runfiles), primaryOutput, false);
     this.manifestWriter = manifestWriter;
     this.runfiles = runfiles;
   }
-- 
cgit v1.2.3