Automated rollback of commit eee53d3a33dde441f7e7adaecde81ef2d3db7c1b.

*** Reason for rollback ***

breaks Blaze_CorpTest

*** Original change description ***

@AutoCodec ConfiguredTargetValue.

PiperOrigin-RevId: 187783702

2 files changed, 2 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java
index a842b86be9..731357c4cd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParams.java
@@ -47,17 +47,15 @@ public final class CcLinkParams {
   /**
    * A list of link options contributed by a single configured target.
    *
-   * <p><b>WARNING:</b> Do not implement {@code #equals()} in the obvious way. This class must be
+   * <b>WARNING:</b> Do not implement {@code #equals()} in the obvious way. This class must be
    * checked for equality by object identity because otherwise if two configured targets contribute
    * the same link options, they will be de-duplicated, which is not the desirable behavior.
    */
-  @AutoCodec
   @Immutable
   public static final class LinkOptions {
     private final ImmutableList<String> linkOptions;
 
-    @VisibleForSerialization
-    LinkOptions(Iterable<String> linkOptions) {
+    private LinkOptions(Iterable<String> linkOptions) {
       this.linkOptions = ImmutableList.copyOf(linkOptions);
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
index 95a5a9436a..4c327cb993 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
@@ -19,7 +19,6 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.skylark.SkylarkApiProvider;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
@@ -37,7 +36,6 @@ import com.google.devtools.build.lib.vfs.PathFragment;
           + "Every C++-related target provides this struct, accessible as a <code>cc</code> field "
           + "on <a href=\"Target.html\">target</a>."
 )
-@AutoCodec
 public final class CcSkylarkApiProvider extends SkylarkApiProvider {
   /** The name of the field in Skylark used to access this class. */
   public static final String NAME = "cc";