StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a --symlinks argument to soong_zip

Browse Source 
Add a --symlinks argument that defaults to true to soong_zip.
Passing --symlinks=false will cause it to follow symlinks instead
of storing them in the zip file.

Relands I4deb98daa9d4ba9f94e3d7670c117fe00381d2ba with tests.

Bug: 112843624
Test: glob_test.go
Test: zip_test.go
Test: m checkbuild
Change-Id: I0eff9c1f2dba79e873fda381ff585df55d5aaaad
This commit is contained in:
Colin Cross
2018-09-21 15:12:39 -07:00
parent 1d98ee23a3
commit 09f11056f8
3 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
zip/zip.go
View File

@@ -188,6 +188,8 @@ type ZipWriter struct {
compressorPool sync.Pool
compLevel int
followSymlinks pathtools.ShouldFollowSymlinks
fs pathtools.FileSystem
}
@@ -212,7 +214,9 @@ type ZipArgs struct {
NumParallelJobs int
NonDeflatedFiles map[string]bool
WriteIfChanged bool
Filesystem pathtools.FileSystem
StoreSymlinks bool
Filesystem pathtools.FileSystem
}
const NOQUOTE = '\x00'
@@ -263,13 +267,17 @@ func ZipTo(args ZipArgs, w io.Writer) error {
args.AddDirectoryEntriesToZip = true
}
// Have Glob follow symlinks if they are not being stored as symlinks in the zip file.
followSymlinks := pathtools.ShouldFollowSymlinks(!args.StoreSymlinks)
z := &ZipWriter{
time: jar.DefaultTime,
createdDirs: make(map[string]string),
createdFiles: make(map[string]string),
directories: args.AddDirectoryEntriesToZip,
compLevel: args.CompressionLevel,
fs: args.Filesystem,
time: jar.DefaultTime,
createdDirs: make(map[string]string),
createdFiles: make(map[string]string),
directories: args.AddDirectoryEntriesToZip,
compLevel: args.CompressionLevel,
followSymlinks: followSymlinks,
fs: args.Filesystem,
}
if z.fs == nil {
@@ -288,7 +296,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
continue
}
globbed, _, err := z.fs.Glob(s, nil, pathtools.DontFollowSymlinks)
globbed, _, err := z.fs.Glob(s, nil, followSymlinks)
if err != nil {
return err
}
@@ -317,7 +325,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
Err: syscall.ENOTDIR,
}
}
globbed, _, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, pathtools.DontFollowSymlinks)
globbed, _, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks)
if err != nil {
return err
}
@@ -559,7 +567,15 @@ func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar bool) er
var fileSize int64
var executable bool
if s, err := z.fs.Lstat(src); err != nil {
var s os.FileInfo
var err error
if z.followSymlinks {
s, err = z.fs.Stat(src)
} else {
s, err = z.fs.Lstat(src)
}
if err != nil {
return err
} else if s.IsDir() {
if z.directories {