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

Commit d1a81a9a authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Increase errorprone heap size" am: ea74a477 am: 16836c46 am: 025c13b6 

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

Change-Id: Iedfc5c83d5b8b0c75e751f5d7522b456f9f71276
parents 2d6938c5 025c13b6

java/base.go

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB 
		}

		errorProneFlags = append(errorProneFlags, j.properties.Errorprone.Javacflags...)



		flags.errorProneExtraJavacFlags = "${config.ErrorProneFlags} " +

		flags.errorProneExtraJavacFlags = "${config.ErrorProneHeapFlags} ${config.ErrorProneFlags} " +

			"'" + strings.Join(errorProneFlags, " ") + "'"

		flags.errorProneProcessorPath = classpath(android.PathsForSource(ctx, config.ErrorProneClasspath))

	}

java/config/config.go

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ func init() { 


	pctx.StaticVariable("JavacHeapSize", "2048M")

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



	// ErrorProne can use significantly more memory than javac alone, give it a higher heap

	// size (b/221480398).

	pctx.StaticVariable("ErrorProneHeapSize", "4096M")

	pctx.StaticVariable("ErrorProneHeapFlags", "-J-Xmx${ErrorProneHeapSize}")



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



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