Merge "Increase errorprone heap size"

2022-02-28 23:02:12 +00:00
parent ff100cdae9 8bf6cad170
commit ea74a4779f
2 changed files with 7 additions and 1 deletions
--- a/java/base.go
+++ b/java/base.go
@@ -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))
 	}