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

This reverts commit 08e28abc4e.

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

Bug: 116737386
Change-Id: I048f94889a66fe618058e37a5827d0cf6b1a6b68
This commit is contained in:
Colin Cross
2018-09-26 21:36:22 +00:00
parent c7feeff1e9
commit 7f33b81ef6
5 changed files with 7 additions and 25 deletions

View File

@@ -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) {