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
diff --git a/java/app_builder.go b/java/app_builder.go
index e27b1b7..954ca44 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -103,10 +103,10 @@
`cp ${manifest} ${outDir}/AndroidManifest.xml && ` +
`cp ${classesJar} ${outDir}/classes.jar && ` +
`cp ${rTxt} ${outDir}/R.txt && ` +
- `${config.SoongZipCmd} -jar -o $out -C ${outDir} -D ${outDir}`,
+ `${config.SoongZipCmd} -jar -o $out -C ${outDir} -D ${outDir} ${resArgs}`,
CommandDeps: []string{"${config.SoongZipCmd}"},
},
- "manifest", "classesJar", "rTxt", "outDir")
+ "manifest", "classesJar", "rTxt", "resArgs", "outDir")
func BuildAAR(ctx android.ModuleContext, outputFile android.WritablePath,
classesJar, manifest, rTxt android.Path, res android.Paths) {
diff --git a/java/builder.go b/java/builder.go
index 07af8eb..48b5a7b 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -321,7 +321,7 @@
Output: outputFile,
Implicits: deps,
Args: map[string]string{
- "jarArgs": strings.Join(proptools.NinjaAndShellEscape(jarArgs), " "),
+ "jarArgs": strings.Join(proptools.NinjaEscape(jarArgs), " "),
},
})
}
diff --git a/java/java_resources.go b/java/java_resources.go
index 4d8a757..fdc1590 100644
--- a/java/java_resources.go
+++ b/java/java_resources.go
@@ -20,8 +20,6 @@
"strings"
"android/soong/android"
-
- "github.com/google/blueprint/pathtools"
)
var resourceExcludes = []string{
@@ -66,7 +64,7 @@
if !strings.HasPrefix(path, dir.String()) {
panic(fmt.Errorf("path %q does not start with %q", path, dir))
}
- args = append(args, "-f", pathtools.MatchEscape(path))
+ args = append(args, "-f", path)
}
}
}
@@ -109,7 +107,7 @@
if i == 0 || dir != lastDir {
args = append(args, "-C", dir)
}
- args = append(args, "-f", pathtools.MatchEscape(path))
+ args = append(args, "-f", path)
lastDir = dir
}
diff --git a/zip/cmd/main.go b/zip/cmd/main.go
index f49105a..dfd56dc 100644
--- a/zip/cmd/main.go
+++ b/zip/cmd/main.go
@@ -199,11 +199,6 @@
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 4a02531..6b36e10 100644
--- a/zip/zip.go
+++ b/zip/zip.go
@@ -224,20 +224,9 @@
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)