commit 30486987cf93ef76a725a5761c5153c230e9079e
author Yohann Roussel <yroussel@google.com> Tue Jul 21 16:25:44 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Oct 21 17:02:53 2015 +0200
tree e55eb0f6dc2056e81a0a08e875499ad0e151b1bc
parent 534a9b68ec5e8dda8f6e0a07bf0fdbaeb0cedbfe

Fix art-run-tests dependencies

Their classpath dependency was missing

(cherry picked from commit 6c8d5962573e2df393594bbcee80d07f16edafe3)

Change-Id: Id4f489c140585c62b6c105533b97837612c6199c

build/Android.common_path.mk

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index a561c5f..4abd191 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -90,6 +90,8 @@
 TARGET_CORE_DEX_FILES := $(foreach jar,$(TARGET_CORE_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar), ,COMMON)/javalib.jar)
 
 # Classpath for Jack compilation: we only need core-libart.
-HOST_JACK_CLASSPATH   := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart-hostdex,t,COMMON)/classes.jack)
-TARGET_JACK_CLASSPATH := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart, ,COMMON)/classes.jack)
+HOST_JACK_CLASSPATH_DEPENDENCIES   := $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart-hostdex,t,COMMON)/classes.jack
+HOST_JACK_CLASSPATH                := $(foreach dep,$(HOST_JACK_CLASSPATH_DEPENDENCIES),$(abspath $(dep)))
+TARGET_JACK_CLASSPATH_DEPENDENCIES := $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart, ,COMMON)/classes.jack
+TARGET_JACK_CLASSPATH              := $(foreach dep,$(TARGET_JACK_CLASSPATH_DEPENDENCIES),$(abspath $(dep)))
 endif # ART_ANDROID_COMMON_PATH_MK