Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a

am: 1558db6a87

Change-Id: I01ebe1958d0a337d7875c171c7f680560ef240ea
This commit is contained in:
Bryan Eyler 2017-07-07 01:35:50 +00:00 committed by android-build-merger
commit 0602eacffe
1 changed files with 1 additions and 0 deletions

View File

@ -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