Merge "Collect deps from r8" am: 057beb2146 am: c20adfad25 am: 9c495b2617 (2b6b13ac) · Commits · e / os / android_build_soong

java/dex.go

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -132,12 +132,15 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
	`--no-data-resources ` +		`--no-data-resources ` +
	`-printmapping ${outDict} ` +		`-printmapping ${outDict} ` +
	`-printusage ${outUsage} ` +		`-printusage ${outUsage} ` +
			`--deps-file ${out}.d ` +
	`$r8Flags && ` +		`$r8Flags && ` +
	`touch "${outDict}" "${outUsage}" && ` +		`touch "${outDict}" "${outUsage}" && ` +
	`${config.SoongZipCmd} -o ${outUsageZip} -C ${outUsageDir} -f ${outUsage} && ` +		`${config.SoongZipCmd} -o ${outUsageZip} -C ${outUsageDir} -f ${outUsage} && ` +
	`rm -rf ${outUsageDir} && ` +		`rm -rf ${outUsageDir} && ` +
	`$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` +		`$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`,
			Depfile: "${out}.d",
			Deps: blueprint.DepsGCC,
	CommandDeps: []string{		CommandDeps: []string{
	"${config.R8Cmd}",		"${config.R8Cmd}",
	"${config.Zip2ZipCmd}",		"${config.Zip2ZipCmd}",