diff options
author | Googler <noreply@google.com> | 2015-04-02 15:06:46 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-04-03 20:36:27 +0000 |
commit | 61a8f1d87b4439599c89e5dcdd83b4efcc6a8b97 (patch) | |
tree | 6d4d44acda4df05bdd3678ec3de654194ecb0b21 /src/objc_tools | |
parent | d10e352331b4ca95e5fb86856b60deae9af29b3d (diff) |
Description redacted.
--
MOS_MIGRATED_REVID=90162183
Diffstat (limited to 'src/objc_tools')
-rw-r--r-- | src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java | 9 |
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); } } } |