Fix dalvik_jtreg build.
Use the same technique frameworks/base uses when building external/apache-http
to build the dalvik_jtreg dependencies. This is ugly, but seems to keep the
host and device builds off each others' toes.
diff --git a/libcore/tools/dalvik_jtreg/Android.mk b/libcore/tools/dalvik_jtreg/Android.mk
index fd6fe73..50583b7 100644
--- a/libcore/tools/dalvik_jtreg/Android.mk
+++ b/libcore/tools/dalvik_jtreg/Android.mk
@@ -2,7 +2,15 @@
include $(CLEAR_VARS)
+ext_dirs := \
+ ../../../../external/jsr305/ri/src/main/java \
+ ../../../../external/guava/src \
+ ../../../../external/caliper/src
+
+ext_src_files := $(call all-java-files-under,$(ext_dirs))
+
LOCAL_SRC_FILES := \
+ $(ext_src_files) \
java/dalvik/jtreg/Adb.java \
java/dalvik/jtreg/CaliperFinder.java \
java/dalvik/jtreg/CaliperRunner.java \
@@ -29,7 +37,7 @@
java/dalvik/jtreg/XmlReportPrinter.java \
LOCAL_MODULE:= dalvik_jtreg
-LOCAL_STATIC_JAVA_LIBRARIES := javatest jh jtreg kxml2-2.3.0 caliper
+LOCAL_STATIC_JAVA_LIBRARIES := javatest jh jtreg kxml2-2.3.0
# TODO this only works when junit is already built...
LOCAL_JAVA_LIBRARIES := junit
