tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Replace DX_ALT_JAR with USE_D8" am: 3b236ad3e3 am: 524ede46bb

Browse source 
am: a2243f1ef8

Change-Id: I7489b09152336e685a8e1faf682ed85c6fd269fc
This commit is contained in:
Alan Leung 2017-09-20 20:11:06 +00:00 committed by android-build-merger
commit befd06d051
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/config.mk
View file

@ -513,13 +513,13 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)
ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign
ifndef DX_ALT_JAR
DX := $(HOST_OUT_EXECUTABLES)/dx
DX_COMMAND := $(DX) -JXms16M -JXmx2048M
ifeq ($(USE_D8),true)
DX := $(HOST_OUT_EXECUTABLES)/d8
else
DX := $(DX_ALT_JAR)
DX_COMMAND := $(JAVA) -Xms16M -Xmx2048M -jar $(DX)
DX := $(HOST_OUT_EXECUTABLES)/dx
endif
DX_COMMAND := $(DX) -JXms16M -JXmx2048M
else # TARGET_BUILD_APPS || TARGET_BUILD_PDK
AIDL := $(prebuilt_sdk_tools_bin)/aidl
AAPT := $(prebuilt_sdk_tools_bin)/aapt