commit 5e50b342218fe2b9c1af20fd7da3c173bfac0499
author Yohann Roussel <yroussel@google.com> Thu Jul 02 12:10:17 2015 +0200
committer Yohann Roussel <yroussel@google.com> Fri Jul 03 11:58:38 2015 +0200
tree c4baa9f3d4fef849b197dfe9f1bcf9ec5c0351e7
parent 0031c646c85a809d2ec16d9057a59f098d42c0df

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.

Change-Id: I28b5f7176747853ef707b8d4055017bf60296641

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index b371289..83138aa 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -619,7 +619,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) $(JACK_JAR) $(JACK_LAUNCHER_JAR)
+        $(LOCAL_MODULE_MAKEFILE) $(JACK)
 
 ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
 $(full_classes_jack): $(jack_all_deps)