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
diff --git a/java/java_resources.go b/java/java_resources.go
index 4d8a757..fdc1590 100644
--- a/java/java_resources.go
+++ b/java/java_resources.go
@@ -20,8 +20,6 @@
"strings"
"android/soong/android"
-
- "github.com/google/blueprint/pathtools"
)
var resourceExcludes = []string{
@@ -66,7 +64,7 @@
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 @@
if i == 0 || dir != lastDir {
args = append(args, "-C", dir)
}
- args = append(args, "-f", pathtools.MatchEscape(path))
+ args = append(args, "-f", path)
lastDir = dir
}