Merge "Re-compute DX command if it changes for PDK."

2017-07-07 01:22:36 +00:00 · 2017-07-07 01:22:36 +00:00 · 7edc11830a
parent 8eff2d7c8e d4794315ff
commit 7edc11830a
1 changed files with 1 additions and 0 deletions
--- a/core/config.mk
+++ b/core/config.mk
@ -554,6 +554,7 @@ SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
 SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64

 DX := $(prebuilt_sdk_tools)/dx
+DX_COMMAND := $(DX) -JXms16M -JXmx2048M
 MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

 # Don't use prebuilts in PDK