1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java
index 7995681706..60071469f5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java
@@ -18,8 +18,9 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.hash.HashCode;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.skyframe.serialization.FastStringCodec;
 import com.google.devtools.build.lib.skyframe.serialization.PathCodec;
+import com.google.devtools.build.lib.skyframe.serialization.SerializationException;
+import com.google.devtools.build.lib.skyframe.serialization.strings.StringCodecs;
 import com.google.devtools.build.lib.util.StringCanonicalizer;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
@@ -243,17 +244,18 @@ public final class BlazeDirectories {
         && this.execRoot.equals(that.execRoot);
   }
 
-  void serialize(CodedOutputStream codedOut, PathCodec pathCodec) throws IOException {
+  void serialize(CodedOutputStream codedOut, PathCodec pathCodec)
+      throws IOException, SerializationException {
     serverDirectories.serialize(codedOut, pathCodec);
     pathCodec.serialize(workspace, codedOut);
-    FastStringCodec.INSTANCE.serialize(productName, codedOut);
+    StringCodecs.asciiOptimized().serialize(productName, codedOut);
   }
 
   static BlazeDirectories deserialize(CodedInputStream codedIn, PathCodec pathCodec)
-      throws IOException {
+      throws IOException, SerializationException {
     return new BlazeDirectories(
         ServerDirectories.deserialize(codedIn, pathCodec),
         pathCodec.deserialize(codedIn),
-        FastStringCodec.INSTANCE.deserialize(codedIn));
+        StringCodecs.asciiOptimized().deserialize(codedIn));
   }
 }