diff options
| author | Colin Cross <ccross@android.com> | 2018-07-15 08:16:31 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-07-16 15:24:43 -0700 |
| commit | 4c03f6876357c01b2977fd61157aad9c7984b741 (patch) | |
| tree | 68f70479c9d4fc7c77c5ddb1cbb277a0f352fdb6 /java/dex.go | |
| parent | 2486065c435bbdcd7cdc6052036616643a8049a2 (diff) | |
| download | android_build_soong-4c03f6876357c01b2977fd61157aad9c7984b741.tar.gz android_build_soong-4c03f6876357c01b2977fd61157aad9c7984b741.tar.bz2 android_build_soong-4c03f6876357c01b2977fd61157aad9c7984b741.zip | |
Make merge_zips -stripFile use blueprint style globs
merge_zips -stripFile was only considering the name of the file and
ignoring the path. Make it more useful by supporting blueprint style
globs. The previous behavior can be recreated by prefixing with **/.
Bug: 111389216
Test: m checkbuild
Change-Id: I25760fe3f1f77704dd9da9d107d9a38a415d681f
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/dex.go b/java/dex.go index 06ee272d..db240fc5 100644 --- a/java/dex.go +++ b/java/dex.go @@ -27,7 +27,7 @@ var d8 = pctx.AndroidStaticRule("d8", Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + `${config.D8Cmd} --output $outDir $dxFlags $in && ` + `${config.SoongZipCmd} -o $outDir/classes.dex.jar -C $outDir -D $outDir && ` + - `${config.MergeZipsCmd} -D -stripFile "*.class" $out $outDir/classes.dex.jar $in`, + `${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`, CommandDeps: []string{ "${config.D8Cmd}", "${config.SoongZipCmd}", @@ -44,7 +44,7 @@ var r8 = pctx.AndroidStaticRule("r8", `-printmapping $outDict ` + `$dxFlags $r8Flags && ` + `${config.SoongZipCmd} -o $outDir/classes.dex.jar -C $outDir -D $outDir && ` + - `${config.MergeZipsCmd} -D -stripFile "*.class" $out $outDir/classes.dex.jar $in`, + `${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`, CommandDeps: []string{ "${config.R8Cmd}", "${config.SoongZipCmd}", |