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

Commit a88b88e2 authored by Colin Cross's avatar Colin Cross Committed by Presubmit Automerger Backend
Browse files

[automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426547

Bug: 207767452
Change-Id: I4148ddbce303a0294385342bc5018b3dc1b260b4
parents 2965f457 b18a037f

java/config/config.go

+0 −2
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ func init() { 
	pctx.StaticVariable("JavacHeapSize", "2048M")

	pctx.StaticVariable("JavacHeapFlags", "-J-Xmx${JavacHeapSize}")

	pctx.StaticVariable("DexFlags", "-JXX:OnError='cat hs_err_pid%p.log' -JXX:CICompilerCount=6 -JXX:+UseDynamicNumberOfGCThreads")

	// TODO(b/181095653): remove duplicated flags.

	pctx.StaticVariable("DexJavaFlags", "-XX:OnError='cat hs_err_pid%p.log' -XX:CICompilerCount=6 -XX:+UseDynamicNumberOfGCThreads -Xmx2G")



	pctx.StaticVariable("CommonJdkFlags", strings.Join([]string{

		`-Xmaxerrs 9999999`,

java/dex.go

+2 −11
Original line number Diff line number Diff line
@@ -84,11 +84,6 @@ func (d *dexer) effectiveOptimizeEnabled() bool { 
	return BoolDefault(d.dexProperties.Optimize.Enabled, d.dexProperties.Optimize.EnabledByDefault)

}



func init() {

	pctx.HostBinToolVariable("runWithTimeoutCmd", "run_with_timeout")

	pctx.SourcePathVariable("jstackCmd", "${config.JavaToolchain}/jstack")

}



var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8",

	blueprint.RuleParams{

		Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
@@ -122,10 +117,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", 
		Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +

			`rm -f "$outDict" && rm -rf "${outUsageDir}" && ` +

			`mkdir -p $$(dirname ${outUsage}) && ` +

			// TODO(b/181095653): remove R8 timeout and go back to config.R8Cmd.

			`${runWithTimeoutCmd} -timeout 30m -on_timeout '${jstackCmd} $$PID' -- ` +

			`$r8Template${config.JavaCmd} ${config.DexJavaFlags} -cp ${config.R8Jar} ` +

			`com.android.tools.r8.compatproguard.CompatProguard -injars $in --output $outDir ` +

			`$r8Template${config.R8Cmd} ${config.DexFlags} -injars $in --output $outDir ` +

			`--no-data-resources ` +

			`-printmapping ${outDict} ` +

			`-printusage ${outUsage} ` +
@@ -136,10 +128,9 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", 
			`$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` +

			`${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`,

		CommandDeps: []string{

			"${config.R8Jar}",

			"${config.R8Cmd}",

			"${config.SoongZipCmd}",

			"${config.MergeZipsCmd}",

			"${runWithTimeoutCmd}",

		},

	}, map[string]*remoteexec.REParams{

		"$r8Template": &remoteexec.REParams{