From 08e28abc4ecd10a0e0ab2dcb683560f9c6331e1b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 18 Sep 2018 17:05:15 -0700 Subject: soong_zip: support globs in -f and -D arguments -f and -D arguments can now take globs in the Soong format. Also update the use of soong_zip that jars resources to escape the globs in the arguments, and then shell-escape them when writing to the rsp file so the glob escape are not intepreted by ReadRespFile. Also remove an unused argument to the buildAAR rule that could have contained values that needed escaping. Test: m checkbuild Change-Id: I7f20bb169dc01f952d2a7681ec6ee9c05737ed37 --- java/java_resources.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/java_resources.go') diff --git a/java/java_resources.go b/java/java_resources.go index fdc159063..4d8a757fa 100644 --- a/java/java_resources.go +++ b/java/java_resources.go @@ -20,6 +20,8 @@ import ( "strings" "android/soong/android" + + "github.com/google/blueprint/pathtools" ) var resourceExcludes = []string{ @@ -64,7 +66,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", path) + args = append(args, "-f", pathtools.MatchEscape(path)) } } } @@ -107,7 +109,7 @@ func resourceFilesToJarArgs(ctx android.ModuleContext, if i == 0 || dir != lastDir { args = append(args, "-C", dir) } - args = append(args, "-f", path) + args = append(args, "-f", pathtools.MatchEscape(path)) lastDir = dir } -- cgit v1.2.3-59-g8ed1b