commit d8ff682aaffd5ea89d35bd43cd3037fa92eef329
author Yohann Roussel <yroussel@google.com> Tue Nov 25 13:42:00 2014 +0100
committer Yohann Roussel <yroussel@google.com> Wed Dec 10 21:40:27 2014 +0100
tree 84ee239228dc2e704c567ee1a3c49111a47b2141
parent d6abb468e7c4e9bf96716397aa4933da2d89895b

Add jack.jar dependency when using transform-jar-to-jack

(cherry picked from commit e8e442989cec2c045bcc9cc7a19a6a7e49a08c46)

Change-Id: I751ec4cd012bfd3dedb8d14d003621d34c254e8b

tools/vm-tests-tf/Android.mk

diff --git a/tools/vm-tests-tf/Android.mk b/tools/vm-tests-tf/Android.mk
index f96b780..059ac75 100644
--- a/tools/vm-tests-tf/Android.mk
+++ b/tools/vm-tests-tf/Android.mk
@@ -93,10 +93,10 @@
     vmteststf_dep_jars += $(cts-tf-dalvik-lib.jack)
 endif
 
-$(intermediates)/junit.jack:$(LOCAL_PATH)/lib/junit.jar | $(JILL_JAR)
+$(intermediates)/junit.jack:$(LOCAL_PATH)/lib/junit.jar | $(JILL_JAR) $(JACK_JAR)
 	$(transform-jar-to-jack)
 
-$(intermediates)/tradefed-prebuilt.jack:$(HOST_OUT_JAVA_LIBRARIES)/tradefed-prebuilt.jar | $(JILL_JAR)
+$(intermediates)/tradefed-prebuilt.jack:$(HOST_OUT_JAVA_LIBRARIES)/tradefed-prebuilt.jar | $(JILL_JAR) $(JACK_JAR)
 	$(transform-jar-to-jack)
 
 $(vmteststf_jar): PRIVATE_SRC_FOLDER := $(LOCAL_PATH)/src