Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b716ceb8 authored by Colin Cross's avatar Colin Cross
Browse files

Don't delete withres-withoutdex jar from R8 rules 

R8 rules produce a depfile generated by R8.  R8 sees the withres-withoutdex
jar as an input, and so adds it to the depfile.  If the jar is deleted
after running R8 then ninja will always consider the rule dirty, as the
input file listed in the depfile is missing.

Fixes: 303064127
Test: m Calendar && m Calendar
Test: m framework-minus-apex &&  m framework-minus-apex
Change-Id: I5cbd780b56fc131b58598d6e569a8a78b7fe9395
parent 33befd0c

java/dex.go

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", 
			`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 && ` +

			`rm -f "$tmpJar" "$outDir/classes*.dex" "$outDir/classes.dex.jar"`,

			`rm -f "$outDir/classes*.dex" "$outDir/classes.dex.jar"`,

		Depfile: "${out}.d",

		Deps:    blueprint.DepsGCC,

		CommandDeps: []string{