Merge "Delete temporary files after d8 and r8 rules" into main (956f79c5) · Commits · e / os / android_build_soong

java/dex.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -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{