aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/actions
diff options
context:
space:
mode:
authorGravatar shahan <shahan@google.com>2018-02-28 15:57:33 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-28 16:00:01 -0800
commit20f35b448b5d9d04ba366d74d6bf4c7100d91b63 (patch)
tree2bb57b821c5d13be9955e47c917133f7158a32f5 /src/main/java/com/google/devtools/build/lib/actions
parent6e65952aea9223ee1ca998198728200ad27d2bbb (diff)
Deletes CODEC fields now that they are no longer needed.
PiperOrigin-RevId: 187397314
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions')
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java3
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/Artifact.java10
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/CommandLine.java13
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java3
6 files changed, 0 insertions, 35 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java b/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java
index 9059267903..00aa65797f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java
@@ -18,7 +18,6 @@ import com.google.common.collect.Interner;
import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.skyframe.SkyFunctionName;
import com.google.devtools.build.skyframe.SkyKey;
@@ -28,7 +27,6 @@ import com.google.devtools.build.skyframe.SkyKey;
public class ActionLookupData implements SkyKey {
private static final Interner<ActionLookupData> INTERNER = BlazeInterners.newWeakInterner();
public static final SkyFunctionName NAME = SkyFunctionName.create("ACTION_EXECUTION");
- public static final ObjectCodec<ActionLookupData> CODEC = new ActionLookupData_AutoCodec();
private final ActionLookupKey actionLookupKey;
private final int actionIndex;
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java
index caa1859d77..77c67a8121 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.AspectDescriptor;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import javax.annotation.Nullable;
@@ -36,8 +35,6 @@ import javax.annotation.Nullable;
@AutoCodec
@Immutable
public abstract class ActionOwner {
- public static final ObjectCodec<ActionOwner> CODEC = new ActionOwner_AutoCodec();
-
/** An action owner for special cases. Usage is strongly discouraged. */
public static final ActionOwner SYSTEM_ACTION_OWNER =
ActionOwner.create(
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
index 918c6b998c..f0eca50638 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
@@ -30,7 +30,6 @@ import com.google.devtools.build.lib.actions.ActionAnalysisMetadata.MiddlemanTyp
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.shell.ShellUtils;
-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;
@@ -118,8 +117,6 @@ public class Artifact
Comparable<Object>,
CommandLineItem {
- public static final ObjectCodec<Artifact> CODEC = new Artifact_AutoCodec();
-
/** Compares artifact according to their exec paths. Sorts null values first. */
@SuppressWarnings("ReferenceEquality") // "a == b" is an optimization
public static final Comparator<Artifact> EXEC_PATH_COMPARATOR =
@@ -448,10 +445,6 @@ public class Artifact
@VisibleForTesting
@AutoCodec
public static final class SpecialArtifact extends Artifact {
-
- public static final ObjectCodec<SpecialArtifact> CODEC =
- new Artifact_SpecialArtifact_AutoCodec();
-
private final SpecialArtifactType type;
@VisibleForSerialization
@@ -509,9 +502,6 @@ public class Artifact
@Immutable
@AutoCodec
public static final class TreeFileArtifact extends Artifact {
- public static final ObjectCodec<TreeFileArtifact> CODEC =
- new Artifact_TreeFileArtifact_AutoCodec();
-
private final SpecialArtifact parentTreeArtifact;
private final PathFragment parentRelativePath;
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 0e32c867f9..a3abeb5131 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,6 @@ 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.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;
@@ -57,9 +56,6 @@ import java.util.Objects;
@Immutable
@AutoCodec
public final class ArtifactRoot implements Comparable<ArtifactRoot>, Serializable, SkylarkValue {
-
- 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.
public static ArtifactRoot computeSourceRoot(Root packageRoot, RepositoryName repository) {
diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java
index 558644be51..114e7b0bb0 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java
@@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.collect.CollectionUtils;
-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.util.Fingerprint;
@@ -29,9 +28,6 @@ public abstract class CommandLine {
@AutoCodec
@VisibleForSerialization
static class EmptyCommandLine extends CommandLine {
- public static final ObjectCodec<EmptyCommandLine> CODEC =
- new CommandLine_EmptyCommandLine_AutoCodec();
-
@Override
public Iterable<String> arguments() throws CommandLineExpansionException {
return ImmutableList.of();
@@ -66,9 +62,6 @@ public abstract class CommandLine {
@AutoCodec
@VisibleForSerialization
static class SimpleCommandLine extends CommandLine {
- public static final ObjectCodec<SimpleCommandLine> CODEC =
- new CommandLine_SimpleCommandLine_AutoCodec();
-
private Iterable<String> args;
SimpleCommandLine(Iterable<String> args) {
@@ -90,9 +83,6 @@ public abstract class CommandLine {
@AutoCodec
@VisibleForSerialization
static class PrefixedCommandLine extends CommandLine {
- public static final ObjectCodec<PrefixedCommandLine> CODEC =
- new CommandLine_PrefixedCommandLine_AutoCodec();
-
private ImmutableList<String> executableArgs;
private CommandLine commandLine;
@@ -129,9 +119,6 @@ public abstract class CommandLine {
@AutoCodec
@VisibleForSerialization
static class SuffixedCommandLine extends CommandLine {
- public static final ObjectCodec<SuffixedCommandLine> CODEC =
- new CommandLine_SuffixedCommandLine_AutoCodec();
-
private ImmutableList<String> executableArgs;
private CommandLine commandLine;
diff --git a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
index 70a659948e..15c500766c 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
@@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-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.util.Fingerprint;
@@ -31,8 +30,6 @@ import com.google.devtools.build.lib.util.Fingerprint;
@Immutable
@AutoCodec
public final class MiddlemanAction extends AbstractAction {
- public static final ObjectCodec<MiddlemanAction> CODEC = new MiddlemanAction_AutoCodec();
-
public static final String MIDDLEMAN_MNEMONIC = "Middleman";
private final String description;
private final MiddlemanType middlemanType;