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

@@ -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
}