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

Merge "Collect deps from r8"

Browse Source
This commit is contained in:
Colin Cross
2022-03-22 16:40:30 +00:00
committed by Gerrit Code Review
parent f241e72b57 22e6a6f69a
commit 057beb2146
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/dex.go
View File

@@ -132,12 +132,15 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
`--no-data-resources ` + `--no-data-resources ` +
`-printmapping ${outDict} ` + `-printmapping ${outDict} ` +
`-printusage ${outUsage} ` + `-printusage ${outUsage} ` +
`--deps-file ${out}.d ` +
`$r8Flags && ` + `$r8Flags && ` +
`touch "${outDict}" "${outUsage}" && ` + `touch "${outDict}" "${outUsage}" && ` +
`${config.SoongZipCmd} -o ${outUsageZip} -C ${outUsageDir} -f ${outUsage} && ` + `${config.SoongZipCmd} -o ${outUsageZip} -C ${outUsageDir} -f ${outUsage} && ` +
`rm -rf ${outUsageDir} && ` + `rm -rf ${outUsageDir} && ` +
`$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` + `$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` +
`${config.MergeZipsCmd} -D -stripFile "**/*.class" $mergeZipsFlags $out $outDir/classes.dex.jar $in`, `${config.MergeZipsCmd} -D -stripFile "**/*.class" $mergeZipsFlags $out $outDir/classes.dex.jar $in`,
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
CommandDeps: []string{ CommandDeps: []string{
"${config.R8Cmd}", "${config.R8Cmd}",
"${config.Zip2ZipCmd}", "${config.Zip2ZipCmd}",