diff --git a/java/config/config.go b/java/config/config.go
index 4a5a2dd..047c4cb 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -26,15 +26,14 @@
 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("JavacHeapSize", "2048M")
+	pctx.StaticVariable("JavacHeapFlags", "-J-Xmx${JavacHeapSize}")
 
 	pctx.StaticVariable("CommonJdkFlags", strings.Join([]string{
 		`-Xmaxerrs 9999999`,