Automated [] rollback of [].

*** Reason for rollback ***

New ZipCombiner creates malformed output ZIP files when input ZIP files contain more than 65535 entries, the maximum amount for non-64-bit ZIP files.

*** Original change description ***

Rewrite of ZipCombiner to improve performance and maintainability. Added devtools/build/zip to allow reading and writing of ZIP files without requiring decompressing file data to manipulate them.

ZipCombiner API has some changes. ZipCombiner#addZip takes a File instead of InputStream. ZipCombiner#addFile takes a ZipFileEntry instead of DirectoryEntryInfo

--
MOS_MIGRATED_REVID=90279976

1 files changed, 3 insertions, 6 deletions

diff --git a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
index f418d8c8f3..3d3ceaaa44 100644
--- a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
+++ b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
@@ -31,7 +31,6 @@ import com.google.devtools.build.xcode.plmerge.KeysToRemoveIfEmptyString;
 import com.google.devtools.build.xcode.plmerge.PlistMerging;
 import com.google.devtools.build.xcode.zip.ZipFiles;
 import com.google.devtools.build.xcode.zip.ZipInputEntry;
-import com.google.devtools.build.zip.ZipFileEntry;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -197,11 +196,9 @@ public final class BundleMerging {
         if (externalFileAttr == null) {
           externalFileAttr = ZipInputEntry.DEFAULT_EXTERNAL_FILE_ATTRIBUTE;
         }
-        ZipFileEntry zipOutEntry = new ZipFileEntry(entryNamesPrefix + zipInEntry.getName());
-        zipOutEntry.setTime(DOS_EPOCH.getTime());
-        zipOutEntry.setVersion(ZipInputEntry.MADE_BY_VERSION);
-        zipOutEntry.setExternalAttributes(externalFileAttr);
-        combiner.addFile(zipOutEntry, zipIn);
+        combiner.addFile(
+            entryNamesPrefix + zipInEntry.getName(), DOS_EPOCH, zipIn,
+            ZipInputEntry.DEFAULT_DIRECTORY_ENTRY_INFO.withExternalFileAttribute(externalFileAttr));
       }
     }
   }