From e0c45acc6bb833bbb7cc22de03e6cdb7cc43b499 Mon Sep 17 00:00:00 2001
From: Rex Hoffman <rexhoffman@google.com>
Date: Wed, 30 Nov 2022 23:20:51 +0000
Subject: [PATCH] Support robolectric zip expectations (similar to command line
 zip)

Test: mma in /external/robolectric
Bug: 244627502
Change-Id: Id6b2b0bdb7b666a1e598b5451f869bf3d56953e5
---
 third_party/zip/writer.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/third_party/zip/writer.go b/third_party/zip/writer.go
index f5268385d..8a957e163 100644
--- a/third_party/zip/writer.go
+++ b/third_party/zip/writer.go
@@ -162,9 +162,17 @@ func (w *Writer) Close() error {
 		if records > uint16max {
 			records = uint16max
 		}
+		// Only store uint32max for the size and the offset if they don't fit.
+		// Robolectric currently doesn't support zip64 and fails to find the
+		// offset to the central directory when the number of files in the zip
+		// is larger than 2^16.
+		if size > uint32max {
+			size = uint32max
+		}
+		if offset > uint32max {
+			offset = uint32max
+		}
 		// END ANDROID CHANGE
-		size = uint32max
-		offset = uint32max
 	}
 
 	// write end record