diff options
| -rw-r--r-- | java/app_builder.go | 4 | ||||
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | java/java_resources.go | 6 | ||||
| -rw-r--r-- | zip/cmd/main.go | 5 | ||||
| -rw-r--r-- | zip/zip.go | 15 |
5 files changed, 7 insertions, 25 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index e27b1b70..954ca446 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -103,10 +103,10 @@ var buildAAR = pctx.AndroidStaticRule("buildAAR", `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 07af8ebd..48b5a7b6 100644 --- a/java/builder.go +++ b/java/builder.go @@ -321,7 +321,7 @@ func TransformResourcesToJar(ctx android.ModuleContext, outputFile android.Writa 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 4d8a757f..fdc15906 100644 --- a/java/java_resources.go +++ b/java/java_resources.go @@ -20,8 +20,6 @@ import ( "strings" "android/soong/android" - - "github.com/google/blueprint/pathtools" ) var resourceExcludes = []string{ @@ -66,7 +64,7 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext, 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 @@ func resourceFilesToJarArgs(ctx android.ModuleContext, 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 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, @@ -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) |