Preserve executable bit in soong_zip
Bug: 36292596
Test: m -j vts; zipinfo out/host/linux-x86/vts/android-vts.zip
Change-Id: If595641544cc387019d93b99e0a7890e0b7a9453
diff --git a/cmd/soong_zip/soong_zip.go b/cmd/soong_zip/soong_zip.go
index b0f3daa..605d4a4 100644
--- a/cmd/soong_zip/soong_zip.go
+++ b/cmd/soong_zip/soong_zip.go
@@ -357,6 +357,7 @@
func (z *zipWriter) writeFile(rel, file string) error {
var fileSize int64
+ var executable bool
if s, err := os.Lstat(file); err != nil {
return err
@@ -371,6 +372,7 @@
return fmt.Errorf("%s is not a file, directory, or symlink", file)
} else {
fileSize = s.Size()
+ executable = s.Mode()&0100 != 0
}
if z.directories {
@@ -395,6 +397,9 @@
},
}
ze.fh.SetModTime(z.time)
+ if executable {
+ ze.fh.SetMode(0700)
+ }
r, err := os.Open(file)
if err != nil {
@@ -445,7 +450,7 @@
f.Close()
}(wg, r)
} else {
- go z.compressWholeFile(rel, r, exec, compressChan)
+ go z.compressWholeFile(rel, r, executable, exec, compressChan)
}
return nil
@@ -514,7 +519,7 @@
return buf, nil
}
-func (z *zipWriter) compressWholeFile(rel string, r *os.File, exec Execution, compressChan chan *zipEntry) {
+func (z *zipWriter) compressWholeFile(rel string, r *os.File, executable bool, exec Execution, compressChan chan *zipEntry) {
var bufSize int
defer r.Close()
@@ -524,6 +529,9 @@
Method: zip.Deflate,
}
fileHeader.SetModTime(z.time)
+ if executable {
+ fileHeader.SetMode(0700)
+ }
crc := crc32.NewIEEE()
count, err := io.Copy(crc, r)