StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure that the R8 minification map (ProGuard dictionary) file exists"

Browse Source
This commit is contained in:
Søren Gjesse
2018-08-27 16:06:07 +00:00
committed by Gerrit Code Review
parent 09664bd9a5 0e84935ac4
commit 0d91f1727e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/dex.go
View File

@@ -39,10 +39,12 @@ var d8 = pctx.AndroidStaticRule("d8",
var r8 = pctx.AndroidStaticRule("r8", var r8 = pctx.AndroidStaticRule("r8",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
`rm -f "$outDict" && ` +
`${config.R8Cmd} -injars $in --output $outDir ` + `${config.R8Cmd} -injars $in --output $outDir ` +
`--force-proguard-compatibility ` + `--force-proguard-compatibility ` +
`-printmapping $outDict ` + `-printmapping $outDict ` +
`$dxFlags $r8Flags && ` + `$dxFlags $r8Flags && ` +
`touch "$outDict" && ` +
`${config.SoongZipCmd} -o $outDir/classes.dex.jar -C $outDir -D $outDir && ` + `${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{ CommandDeps: []string{