commit 3b236ad3e3084a6faf5eb4e01b5d049ed5adb866
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 20 19:56:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 20 19:56:38 2017 +0000
tree e436f33d4993206f131a79fe3ab70de7cade734b
parent 39bbfe217a62fc37e98faca2f8ec2e178cc309fd
parent be7b6ed39703e1b4c46213177659b968b1d4d5cd

Merge "Replace DX_ALT_JAR with USE_D8"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e75fdcb..6fdfd21 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -513,13 +513,13 @@
   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