Description redacted.

--
MOS_MIGRATED_REVID=90162183

1 files changed, 6 insertions, 3 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 3d3ceaaa44..f418d8c8f3 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,6 +31,7 @@ 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;
@@ -196,9 +197,11 @@ public final class BundleMerging {
         if (externalFileAttr == null) {
           externalFileAttr = ZipInputEntry.DEFAULT_EXTERNAL_FILE_ATTRIBUTE;
         }
-        combiner.addFile(
-            entryNamesPrefix + zipInEntry.getName(), DOS_EPOCH, zipIn,
-            ZipInputEntry.DEFAULT_DIRECTORY_ENTRY_INFO.withExternalFileAttribute(externalFileAttr));
+        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);
       }
     }
   }