commit e44e75aa8984b11d9bba5d5d8cb75dede686a4e1
author Colin Cross <ccross@android.com> Tue Jul 18 05:22:59 2017 +0000
committer Colin Cross <ccross@android.com> Tue Jul 18 05:22:59 2017 +0000
tree 3e5be641a06bef6a02dee44267c1819ea499877e
parent e37a3c959a833b9979f7e820cb037711c7453c16

Revert "Use dx.jar directly"

This reverts commit e37a3c959a833b9979f7e820cb037711c7453c16.

Reason for revert: breaks art test runner

Change-Id: Ice0cd3020ddec7f31eb789867a45f047a75a05d0

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 24080dc..e456993 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -673,7 +673,7 @@
 ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
 $(built_dex_intermediate): PRIVATE_DX_FLAGS += --no-locals
 endif
-$(built_dex_intermediate): $(full_classes_jar) $(DX_DEPS)
+$(built_dex_intermediate): $(full_classes_jar) $(DX)
 	$(transform-classes.jar-to-dex)
 endif # LOCAL_JACK_ENABLED is disabled