openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Add a --symlinks argument to soong_zip" 

This reverts commit d59dab94c4.

Bug: 112843624
Change-Id: I3d0f1b61e899b162e65c18662f9d27dd794a9a30
This commit is contained in:
Colin Cross 2018-09-26 21:36:44 +00:00
parent d59dab94c4
commit c7feeff1e9
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zip/cmd/main.go
View File

@ -186,8 +186,6 @@ func main() {
emulateJar := flags.Bool("jar", false, "modify the resultant .zip to emulate the output of 'jar'") emulateJar := flags.Bool("jar", false, "modify the resultant .zip to emulate the output of 'jar'")
writeIfChanged := flags.Bool("write_if_changed", false, "only update resultant .zip if it has changed") writeIfChanged := flags.Bool("write_if_changed", false, "only update resultant .zip if it has changed")
symlinks := flags.Bool("symlinks", true, "store symbolic links in zip instead of following them")
parallelJobs := flags.Int("parallel", runtime.NumCPU(), "number of parallel threads to use") parallelJobs := flags.Int("parallel", runtime.NumCPU(), "number of parallel threads to use")
cpuProfile := flags.String("cpuprofile", "", "write cpu profile to file") cpuProfile := flags.String("cpuprofile", "", "write cpu profile to file")
traceFile := flags.String("trace", "", "write trace to file") traceFile := flags.String("trace", "", "write trace to file")
@ -218,10 +216,9 @@ func main() {
NumParallelJobs: *parallelJobs, NumParallelJobs: *parallelJobs,
NonDeflatedFiles: nonDeflatedFiles, NonDeflatedFiles: nonDeflatedFiles,
WriteIfChanged: *writeIfChanged, WriteIfChanged: *writeIfChanged,
StoreSymlinks: *symlinks,
}) })
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, "error:", err.Error()) fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1) os.Exit(1)
} }
} }

30
zip/zip.go
View File

@ -107,7 +107,6 @@ type ZipWriter struct {
compressorPool sync.Pool compressorPool sync.Pool
compLevel int compLevel int
followSymlinks pathtools.ShouldFollowSymlinks
} }
type zipEntry struct { type zipEntry struct {
@ -133,7 +132,6 @@ type ZipArgs struct {
NumParallelJobs int NumParallelJobs int
NonDeflatedFiles map[string]bool NonDeflatedFiles map[string]bool
WriteIfChanged bool WriteIfChanged bool
StoreSymlinks bool
} }
const NOQUOTE = '\x00' const NOQUOTE = '\x00'
@ -214,16 +212,12 @@ func Run(args ZipArgs) (err error) {
args.AddDirectoryEntriesToZip = true args.AddDirectoryEntriesToZip = true
} }
// Have Glob follow symlinks if they are not being stored as symlinks in the zip file.
followSymlinks := pathtools.ShouldFollowSymlinks(!args.StoreSymlinks)
w := &ZipWriter{ w := &ZipWriter{
time: jar.DefaultTime, time: jar.DefaultTime,
createdDirs: make(map[string]string), createdDirs: make(map[string]string),
createdFiles: make(map[string]string), createdFiles: make(map[string]string),
directories: args.AddDirectoryEntriesToZip, directories: args.AddDirectoryEntriesToZip,
compLevel: args.CompressionLevel, compLevel: args.CompressionLevel,
followSymlinks: followSymlinks,
} }
pathMappings := []pathMapping{} pathMappings := []pathMapping{}
@ -232,14 +226,14 @@ func Run(args ZipArgs) (err error) {
for _, fa := range args.FileArgs { for _, fa := range args.FileArgs {
var srcs []string var srcs []string
for _, s := range fa.SourceFiles { for _, s := range fa.SourceFiles {
globbed, _, err := pathtools.Glob(s, nil, followSymlinks) globbed, _, err := pathtools.Glob(s, nil, pathtools.DontFollowSymlinks)
if err != nil { if err != nil {
return err return err
} }
srcs = append(srcs, globbed...) srcs = append(srcs, globbed...)
} }
if fa.GlobDir != "" { if fa.GlobDir != "" {
globbed, _, err := pathtools.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks) globbed, _, err := pathtools.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, pathtools.DontFollowSymlinks)
if err != nil { if err != nil {
return err return err
} }
@ -478,15 +472,7 @@ func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar bool) er
var fileSize int64 var fileSize int64
var executable bool var executable bool
var s os.FileInfo if s, err := os.Lstat(src); err != nil {
var err error
if z.followSymlinks {
s, err = os.Stat(src)
} else {
s, err = os.Lstat(src)
}
if err != nil {
return err return err
} else if s.IsDir() { } else if s.IsDir() {
if z.directories { if z.directories {