commit b2c5558435b6628b6500be9f197269f95a89c983
author Yohann Roussel <yroussel@google.com> Thu Jul 02 12:10:17 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Oct 21 17:02:25 2015 +0200
tree d338780d8f394408519d6647c5352b05358d2f7f
parent f5782d609724b5f41506433392ca51e1bed9c828

Clean call-jack and its callers

This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

(cherry picked from commit 5e50b342218fe2b9c1af20fd7da3c173bfac0499)

Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 034b5ec..505bd45 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -313,7 +313,7 @@
 ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)
 $(intermediates.COMMON)/classes.jack : PRIVATE_JILL_FLAGS:=$(LOCAL_JILL_FLAGS)
 $(intermediates.COMMON)/classes.jack : $(my_src_jar) $(LOCAL_MODULE_MAKEFILE_DEP) \
-        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK_JAR) $(JACK_LAUNCHER_JAR)
+        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK)
 	$(transform-jar-to-jack)
 
 endif # JAVA_LIBRARIES