commit 55f5fd78199a5fa09523c334ce5d0b5f31f41d81
author Googler <cushon@google.com> Fri Apr 05 12:38:59 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 05 12:40:52 2024 -0700
tree 331111712957bd05c93aa2d0d0e372ebaa129977
parent 77469e0385b585281f93720c5cd4744a7e8ca3c6

Remove a workaround for an obsolete javac zip64 bug

This was added in unknown commit to work around
https://bugs.openjdk.java.net/browse/JDK-7018859, which was fixed in JDK 7.

PiperOrigin-RevId: 622254899
Change-Id: I42d4e8c06bd758b97d7f3ca1e98de02541982db8

src/tools/singlejar/output_jar.cc

diff --git a/src/tools/singlejar/output_jar.cc b/src/tools/singlejar/output_jar.cc
index d6b9785..af02fdb 100644
--- a/src/tools/singlejar/output_jar.cc
+++ b/src/tools/singlejar/output_jar.cc
@@ -878,15 +878,8 @@
       ecd->signature();
       ecd->this_disk_entries16(0xFFFF);
       ecd->total_entries16(0xFFFF);
-      // Java Compiler (javac) uses its own "optimized" Zip handler (see
-      // https://bugs.openjdk.java.net/browse/JDK-7018859) which may fail
-      // to handle 0xFFFFFFFF in the CEN size and CEN offset fields. Try
-      // to use 32-bit values here, too. Hopefully by the time we need to
-      // handle really large archives, this is fixes upstream. Note that this
-      // affects javac and javah only, 'jar' experiences no problems.
-      ecd->cen_size32(std::min(cen_size, static_cast<size_t>(0xFFFFFFFFUL)));
-      ecd->cen_offset32(
-          std::min(output_position, static_cast<off64_t>(0x0FFFFFFFFL)));
+      ecd->cen_size32(0xFFFFFFFF);
+      ecd->cen_offset32(0xFFFFFFFF);
     }
   } else {
     ECD *ecd = reinterpret_cast<ECD *>(ReserveCdh(sizeof(ECD)));