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

Commit 22e6a6f6 authored by Colin Cross's avatar Colin Cross
Browse files

Collect deps from r8 

Use the new --deps-file argument to collect a deps file from r8, which
will correctly track files included by proguard flags files.

Fixes: 221956283
Test: manual
Change-Id: I92341948311c2c994cc0ae032dc19e09b2e80550
parent 2f39f7da

java/dex.go

+3 −0
Original line number Diff line number Diff line
@@ -132,12 +132,15 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", 
			`--no-data-resources ` +

			`-printmapping ${outDict} ` +

			`-printusage ${outUsage} ` +

			`--deps-file ${out}.d ` +

			`$r8Flags && ` +

			`touch "${outDict}" "${outUsage}" && ` +

			`${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`,

		Depfile: "${out}.d",

		Deps:    blueprint.DepsGCC,

		CommandDeps: []string{

			"${config.R8Cmd}",

			"${config.Zip2ZipCmd}",