Keep the bytes of the hashcode instead of the hashcode object.

--
MOS_MIGRATED_REVID=106174495

1 files changed, 4 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
index 302240f74d..de36382811 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import com.google.common.collect.Sets;
-import com.google.common.hash.HashCode;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -203,7 +202,7 @@ public class PackageDeserializer {
       }
     }
     AttributeContainerWithoutLocation attributeContainer =
-        new AttributeContainerWithoutLocation(ruleClass, hasher.hash());
+        new AttributeContainerWithoutLocation(ruleClass, hasher.hash().asBytes());
 
     Label ruleLabel = deserializeLabel(rulePb.getName());
     try {
@@ -673,10 +672,10 @@ public class PackageDeserializer {
   public static class AttributeContainerWithoutLocation extends AttributeContainer {
 
     @Nullable
-    private final HashCode syntheticAttrHash;
+    private final byte[] syntheticAttrHash;
 
     private AttributeContainerWithoutLocation(RuleClass ruleClass,
-        @Nullable HashCode syntheticAttrHash) {
+        @Nullable byte[] syntheticAttrHash) {
       super(ruleClass, null);
       this.syntheticAttrHash = syntheticAttrHash;
     }
@@ -696,9 +695,8 @@ public class PackageDeserializer {
       throw new UnsupportedOperationException("Setting location not supported");
     }
 
-
     @Nullable
-    public HashCode getSyntheticAttrHash() {
+    public byte[] getSyntheticAttrHash() {
       return syntheticAttrHash;
     }