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

Commit 72928074 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't delete withres-withoutdex jar from R8 rules" into main

parents 4ac292ff b716ceb8

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{