Revert "soong_zip: support globs in -f and -D arguments"

This reverts commit 08e28abc4ecd10a0e0ab2dcb683560f9c6331e1b.

Reason for revert: inserts extra ../../ entries in the zip file.

Bug: 116737386
Change-Id: I048f94889a66fe618058e37a5827d0cf6b1a6b68

2 files changed, 2 insertions, 18 deletions

diff --git a/zip/cmd/main.go b/zip/cmd/main.go
index f49105a6..dfd56dc6 100644
--- a/zip/cmd/main.go
+++ b/zip/cmd/main.go
@@ -199,11 +199,6 @@ func main() {
 
 	flags.Parse(expandedArgs[1:])
 
-	if flags.NArg() > 0 {
-		fmt.Fprintf(os.Stderr, "unexpected arguments %s\n", strings.Join(flags.Args(), " "))
-		usage()
-	}
-
 	err := zip.Run(zip.ZipArgs{
 		FileArgs:                 fArgs,
 		OutputFilePath:           *out,
diff --git a/zip/zip.go b/zip/zip.go
index 4a02531e..6b36e102 100644
--- a/zip/zip.go
+++ b/zip/zip.go
@@ -224,20 +224,9 @@ func Run(args ZipArgs) (err error) {
 	noCompression := args.CompressionLevel == 0
 
 	for _, fa := range args.FileArgs {
-		var srcs []string
-		for _, s := range fa.SourceFiles {
-			globbed, _, err := pathtools.Glob(s, nil, pathtools.DontFollowSymlinks)
-			if err != nil {
-				return err
-			}
-			srcs = append(srcs, globbed...)
-		}
+		srcs := fa.SourceFiles
 		if fa.GlobDir != "" {
-			globbed, _, err := pathtools.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, pathtools.DontFollowSymlinks)
-			if err != nil {
-				return err
-			}
-			srcs = append(srcs, globbed...)
+			srcs = append(srcs, recursiveGlobFiles(fa.GlobDir)...)
 		}
 		for _, src := range srcs {
 			err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression)