Have soong_zip not write a data descriptor for non-compressed files
Bug: 64536066
Test: m -j blueprint_tools && cd /tmp && mkdir zip && \
cd zip && touch empty-file && \
echo empty-file > files.list && \
soong_zip -o zip.zip -C . -l files.list && \
jar -xvf zip.zip && echo ok
Change-Id: Iac5797aab5282237fa1cc902e6b068a7937c012a
diff --git a/cmd/soong_zip/soong_zip.go b/cmd/soong_zip/soong_zip.go
index cbec102..ef436a9 100644
--- a/cmd/soong_zip/soong_zip.go
+++ b/cmd/soong_zip/soong_zip.go
@@ -365,7 +365,10 @@
currentWriter, err = zipw.CreateCompressedHeader(op.fh)
} else {
var zw io.Writer
- zw, err = zipw.CreateHeader(op.fh)
+
+ op.fh.CompressedSize64 = op.fh.UncompressedSize64
+
+ zw, err = zipw.CreateHeaderAndroid(op.fh)
currentWriter = nopCloser{zw}
}
if err != nil {