diff --git a/java/config/config.go b/java/config/config.go
index 90d0fb5..c6c8fff 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -26,14 +26,17 @@
 var (
 	pctx = android.NewPackageContext("android/soong/java/config")
 
+	JavacHeapSize = "2048M"
+
 	DefaultLibraries = []string{"core-oj", "core-libart", "ext", "framework", "okhttp"}
 )
 
 func init() {
 	pctx.Import("github.com/google/blueprint/bootstrap")
 
+	pctx.StaticVariable("JavacHeapFlags", "-J-Xmx"+JavacHeapSize)
+
 	pctx.StaticVariable("CommonJdkFlags", strings.Join([]string{
-		`-J-Xmx2048M`,
 		`-Xmaxerrs 9999999`,
 		`-encoding UTF-8`,
 		`-sourcepath ""`,