1 files changed, 10 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java
index 0270ff6237..281f2d0af8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java
@@ -167,15 +167,18 @@ public class CcToolchainFeatures implements Serializable {
       return Objects.hash(text);
     }
   }
-  
-  /**
-   * A chunk of a string value into which a variable should be expanded.
-   */
+
+  /** A chunk of a string value into which a variable should be expanded. */
   @Immutable
-  private static class VariableChunk implements StringChunk, Serializable {
+  @AutoCodec
+  static class VariableChunk implements StringChunk, Serializable {
+    public static final ObjectCodec<VariableChunk> CODEC =
+        new CcToolchainFeatures_VariableChunk_AutoCodec();
+
     private final String variableName;
-    
-    private VariableChunk(String variableName) {
+
+    @VisibleForSerialization
+    VariableChunk(String variableName) {
       this.variableName = variableName;
     }