From be7b6ed39703e1b4c46213177659b968b1d4d5cd Mon Sep 17 00:00:00 2001
From: Alan Leung <acleung@google.com>
Date: Mon, 18 Sep 2017 12:39:52 -0700
Subject: [PATCH] Replace DX_ALT_JAR with USE_D8

Which would invoke the d8 script instead of calling javac on the jar.

BUG: 65212022
Test: m USE_D8=true
Change-Id: I8ee0b14210cb40895b0b208a01606e10a41f0acf
---
 core/config.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index f74f5b4fc5..d5f3ec21cb 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -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