From a12d38a721fec00f85e6c8cdb4a17646a5d3e7ba Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 22 Mar 2017 20:41:14 -0700 Subject: [PATCH] Increase max heap size for javac to 2GB. Compiling Dialer requires increasing the javac heap size above 1GB, probably due to the extensive use of annotation processors. Increase it to 2GB. Test: m -j ANDROID_COMPILE_WITH_JACK=false Change-Id: I4dd3759a98ea915469e69f563dc49be8a25d518e Merged-In: I4dd3759a98ea915469e69f563dc49be8a25d518e (cherry picked from commit 0e785c79b8f1af670d5e16e2623e33f46cc0eb8d) --- core/combo/javac.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/combo/javac.mk b/core/combo/javac.mk index 99bd0eeb9..5c2668c17 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -35,7 +35,7 @@ ifdef JAVAC_WRAPPER endif # Whatever compiler is on this system. -COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_jdk_flags) +COMMON_JAVAC := $(JAVACC) -J-Xmx2048M $(common_jdk_flags) # Eclipse. ifeq ($(CUSTOM_JAVA_COMPILER), eclipse)