summaryrefslogtreecommitdiffstats
path: root/tools/dalvik_jtreg/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'tools/dalvik_jtreg/Android.mk')
-rw-r--r--tools/dalvik_jtreg/Android.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/dalvik_jtreg/Android.mk b/tools/dalvik_jtreg/Android.mk
index 5dbe9e6..fd6fe73 100644
--- a/tools/dalvik_jtreg/Android.mk
+++ b/tools/dalvik_jtreg/Android.mk
@@ -4,6 +4,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
java/dalvik/jtreg/Adb.java \
+ java/dalvik/jtreg/CaliperFinder.java \
+ java/dalvik/jtreg/CaliperRunner.java \
java/dalvik/jtreg/Classpath.java \
java/dalvik/jtreg/Command.java \
java/dalvik/jtreg/CommandFailedException.java \
@@ -12,21 +14,22 @@ LOCAL_SRC_FILES := \
java/dalvik/jtreg/Dx.java \
java/dalvik/jtreg/ExpectedResult.java \
java/dalvik/jtreg/Harness.java \
- java/dalvik/jtreg/JUnit.java \
+ java/dalvik/jtreg/JUnitFinder.java \
java/dalvik/jtreg/JUnitRunner.java \
java/dalvik/jtreg/JavaVm.java \
java/dalvik/jtreg/Javac.java \
- java/dalvik/jtreg/Jtreg.java \
+ java/dalvik/jtreg/JtregFinder.java \
java/dalvik/jtreg/JtregRunner.java \
java/dalvik/jtreg/Result.java \
java/dalvik/jtreg/Strings.java \
java/dalvik/jtreg/TestRun.java \
+ java/dalvik/jtreg/TestFinder.java \
java/dalvik/jtreg/TestRunner.java \
java/dalvik/jtreg/Vm.java \
java/dalvik/jtreg/XmlReportPrinter.java \
LOCAL_MODULE:= dalvik_jtreg
-LOCAL_STATIC_JAVA_LIBRARIES := javatest jh jtreg kxml2-2.3.0
+LOCAL_STATIC_JAVA_LIBRARIES := javatest jh jtreg kxml2-2.3.0 caliper
# TODO this only works when junit is already built...
LOCAL_JAVA_LIBRARIES := junit