Revert "Add a --symlinks argument to soong_zip"

This reverts commit d59dab94c4897f504ca7a3a2b227ca6b000bfaa4.

Bug: 112843624
Change-Id: I3d0f1b61e899b162e65c18662f9d27dd794a9a30

1 files changed, 8 insertions, 22 deletions

diff --git a/zip/zip.go b/zip/zip.go
index d9645b84f..4a02531eb 100644
--- a/zip/zip.go
+++ b/zip/zip.go
@@ -107,7 +107,6 @@ type ZipWriter struct {
 
 	compressorPool sync.Pool
 	compLevel      int
-	followSymlinks pathtools.ShouldFollowSymlinks
 }
 
 type zipEntry struct {
@@ -133,7 +132,6 @@ type ZipArgs struct {
 	NumParallelJobs          int
 	NonDeflatedFiles         map[string]bool
 	WriteIfChanged           bool
-	StoreSymlinks            bool
 }
 
 const NOQUOTE = '\x00'
@@ -214,16 +212,12 @@ func Run(args ZipArgs) (err 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)
-
 	w := &ZipWriter{
-		time:           jar.DefaultTime,
-		createdDirs:    make(map[string]string),
-		createdFiles:   make(map[string]string),
-		directories:    args.AddDirectoryEntriesToZip,
-		compLevel:      args.CompressionLevel,
-		followSymlinks: followSymlinks,
+		time:         jar.DefaultTime,
+		createdDirs:  make(map[string]string),
+		createdFiles: make(map[string]string),
+		directories:  args.AddDirectoryEntriesToZip,
+		compLevel:    args.CompressionLevel,
 	}
 	pathMappings := []pathMapping{}
 
@@ -232,14 +226,14 @@ func Run(args ZipArgs) (err error) {
 	for _, fa := range args.FileArgs {
 		var srcs []string
 		for _, s := range fa.SourceFiles {
-			globbed, _, err := pathtools.Glob(s, nil, followSymlinks)
+			globbed, _, err := pathtools.Glob(s, nil, pathtools.DontFollowSymlinks)
 			if err != nil {
 				return err
 			}
 			srcs = append(srcs, globbed...)
 		}
 		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 {
 				return err
 			}
@@ -478,15 +472,7 @@ func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar bool) er
 	var fileSize int64
 	var executable bool
 
-	var s os.FileInfo
-	var err error
-	if z.followSymlinks {
-		s, err = os.Stat(src)
-	} else {
-		s, err = os.Lstat(src)
-	}
-
-	if err != nil {
+	if s, err := os.Lstat(src); err != nil {
 		return err
 	} else if s.IsDir() {
 		if z.directories {