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/java.mk

diff --git a/core/java.mk b/core/java.mk
index f78bee2..2cf42cb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -648,7 +648,7 @@
 jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \
         $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \
         $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \
-        $(LOCAL_MODULE_MAKEFILE_DEP) $(JACK_JAR) $(JACK_LAUNCHER_JAR)
+        $(LOCAL_MODULE_MAKEFILE_DEP) $(JACK)
 
 ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
 $(full_classes_jack): $(jack_all_deps)