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/java_resources.go | |
| parent | c7feeff1e91db814a38701fe89e473f0c0dda535 (diff) | |
| download | build_soong-7f33b81ef62d3a7e8537ae7f8bdc29439581d3fb.tar.gz build_soong-7f33b81ef62d3a7e8537ae7f8bdc29439581d3fb.tar.bz2 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/java_resources.go')
| -rw-r--r-- | java/java_resources.go | 6 |
1 files changed, 2 insertions, 4 deletions
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 } |