diff options
| author | Colin Cross <ccross@android.com> | 2018-09-26 21:36:22 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-09-26 21:38:07 +0000 |
| commit | 7f33b81ef62d3a7e8537ae7f8bdc29439581d3fb (patch) | |
| tree | 9987957d450b56ea459fe024dd74d74668c60783 /java/app_builder.go | |
| parent | c7feeff1e91db814a38701fe89e473f0c0dda535 (diff) | |
| download | android_build_soong-7f33b81ef62d3a7e8537ae7f8bdc29439581d3fb.tar.gz android_build_soong-7f33b81ef62d3a7e8537ae7f8bdc29439581d3fb.tar.bz2 android_build_soong-7f33b81ef62d3a7e8537ae7f8bdc29439581d3fb.zip | |
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
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 4 |
1 files changed, 2 insertions, 2 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) { |