@AutoCodec all the *ConfiguredTarget classes except for RuleConfiguredTarget. RuleConfiguredTarget is harder, and will be handled in a follow-up.

Also remove duplicate field from InputFileConfiguredTarget and unused parameter in EnvironmentGroupConfiguredTarget constructor.

Largely punt on FilesetOutputConfiguredTarget for now, but will handle soon.

PiperOrigin-RevId: 186829768

1 files changed, 14 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
index 2e56cd2a2b..46dc01c968 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
@@ -16,18 +16,26 @@ package com.google.devtools.build.lib.analysis.configuredtargets;
 
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.analysis.TargetContext;
-import com.google.devtools.build.lib.packages.EnvironmentGroup;
+import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Info;
 import com.google.devtools.build.lib.packages.Provider;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 
 /**
- * Dummy ConfiguredTarget for environment groups. Contains no functionality, since
- * environment groups are not really first-class Targets.
+ * Dummy ConfiguredTarget for environment groups. Contains no functionality, since environment
+ * groups are not really first-class Targets.
  */
+@AutoCodec
 public final class EnvironmentGroupConfiguredTarget extends AbstractConfiguredTarget {
-  public EnvironmentGroupConfiguredTarget(TargetContext targetContext, EnvironmentGroup envGroup) {
-    super(targetContext);
-    Preconditions.checkArgument(targetContext.getConfiguration() == null);
+  @AutoCodec.Instantiator
+  @AutoCodec.VisibleForSerialization
+  EnvironmentGroupConfiguredTarget(Label label) {
+    super(label, null);
+  }
+
+  public EnvironmentGroupConfiguredTarget(TargetContext targetContext) {
+    this(targetContext.getLabel());
+    Preconditions.checkState(targetContext.getConfiguration() == null, targetContext);
   }
 
   @Override