From 56e2840a5739fadc634c31bf03ae519cd7545e41 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 28 Sep 2023 14:38:06 -0700 Subject: [PATCH] Delete temporary files after d8 and r8 rules Delete files created within the d8 and r8 rules that are not considered output files by ninja. This should reduce disk space usage without affecting incremental build performance. Bug: 302573555 Test: m checkbuild Change-Id: Ifea86888c2f385415735ade7d80cf315bc4d057e --- java/dex.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/dex.go b/java/dex.go index 21937e1a5..777ac92eb 100644 --- a/java/dex.go +++ b/java/dex.go @@ -110,7 +110,8 @@ var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8", `${config.Zip2ZipCmd} -i $in -o $tmpJar -x '**/*.dex' && ` + `$d8Template${config.D8Cmd} ${config.D8Flags} --output $outDir $d8Flags $tmpJar && ` + `$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 && ` + + `rm -f "$tmpJar" "$outDir/classes*.dex" "$outDir/classes.dex.jar"`, CommandDeps: []string{ "${config.D8Cmd}", "${config.Zip2ZipCmd}", @@ -152,7 +153,8 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", `${config.SoongZipCmd} -o ${outUsageZip} -C ${outUsageDir} -f ${outUsage} && ` + `rm -rf ${outUsageDir} && ` + `$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 && ` + + `rm -f "$tmpJar" "$outDir/classes*.dex" "$outDir/classes.dex.jar"`, Depfile: "${out}.d", Deps: blueprint.DepsGCC, CommandDeps: []string{