More DalvikRunner cleanup.

Remove the now-unnecessary jsr305 and guava build dependencies.

Move TestActivity.java -- which is only needed at *run* time -- out into
lib/, which lets us simplify the makefile.

Pass the dalvik.annotation.* source files to javac(1) (at *run* time) so
we don't need the run-time dependency on core-intermediates [that I'd
already removed in a successful attempt to find out why we had the
dependency].

We need to remove all uses of those useless annotations from the harmony
tests so we can get back in sync with upstream, but now also so that we
can clean up this part of DalvikRunner.

1 files changed, 3 insertions, 60 deletions

diff --git a/tools/runner/Android.mk b/tools/runner/Android.mk
index 2fb3591..b208219 100644
--- a/tools/runner/Android.mk
+++ b/tools/runner/Android.mk
@@ -1,74 +1,17 @@
 LOCAL_PATH:= $(call my-dir)
 
+# build DalvikRunner from the source under java/.
 include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-        java/dalvik/runner/Aapt.java \
-        java/dalvik/runner/Adb.java \
-        java/dalvik/runner/ActivityMode.java \
-        java/dalvik/runner/CaliperFinder.java \
-        java/dalvik/runner/CaliperRunner.java \
-        java/dalvik/runner/Classpath.java \
-        java/dalvik/runner/CodeFinder.java \
-        java/dalvik/runner/Command.java \
-        java/dalvik/runner/CommandFailedException.java \
-        java/dalvik/runner/DalvikRunner.java \
-        java/dalvik/runner/DeviceDalvikVm.java \
-        java/dalvik/runner/Driver.java \
-        java/dalvik/runner/Dx.java \
-        java/dalvik/runner/Environment.java \
-        java/dalvik/runner/EnvironmentDevice.java \
-        java/dalvik/runner/EnvironmentHost.java \
-        java/dalvik/runner/ExpectedResult.java \
-        java/dalvik/runner/JUnitFinder.java \
-        java/dalvik/runner/JUnitRunner.java \
-        java/dalvik/runner/JavaVm.java \
-        java/dalvik/runner/Javac.java \
-        java/dalvik/runner/JtregFinder.java \
-        java/dalvik/runner/JtregRunner.java \
-        java/dalvik/runner/MainFinder.java \
-        java/dalvik/runner/MainRunner.java \
-        java/dalvik/runner/Md5Cache.java \
-        java/dalvik/runner/Mkdir.java \
-        java/dalvik/runner/Mode.java \
-        java/dalvik/runner/NamingPatternCodeFinder.java \
-        java/dalvik/runner/Option.java \
-        java/dalvik/runner/OptionParser.java \
-        java/dalvik/runner/Result.java \
-        java/dalvik/runner/Rm.java \
-        java/dalvik/runner/Runner.java \
-        java/dalvik/runner/Strings.java \
-        java/dalvik/runner/TestProperties.java \
-        java/dalvik/runner/TestRun.java \
-        java/dalvik/runner/TestRunner.java \
-        java/dalvik/runner/Threads.java \
-        java/dalvik/runner/Vm.java \
-        java/dalvik/runner/XmlReportPrinter.java \
-
+LOCAL_SRC_FILES :=  $(call all-java-files-under,java)
 LOCAL_MODULE:= dalvik_runner
-LOCAL_STATIC_JAVA_LIBRARIES := jsr305 guava caliper javatest jh jtreg kxml2-2.3.0
-
+LOCAL_STATIC_JAVA_LIBRARIES := caliper javatest jh jtreg kxml2-2.3.0
 # TODO this only works when junit is already built...
 LOCAL_JAVA_LIBRARIES := junit
-
 LOCAL_JAVACFLAGS := -Werror -Xlint:unchecked
-
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 include $(call all-subdir-makefiles)
 
-# prebuilt jsr305.jar
-# TODO: do we need this any more? caliper.jar has a jarjar'ed copy.
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := jsr305:lib/jsr305.jar
-include $(BUILD_HOST_PREBUILT)
-
-# prebuilt guava.jar
-# TODO: do we need this any more? caliper.jar has a jarjar'ed copy.
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := guava:lib/guava.jar
-include $(BUILD_HOST_PREBUILT)
-
 # prebuilt caliper.jar
 include $(CLEAR_VARS)
 LOCAL_PREBUILT_JAVA_LIBRARIES := caliper:lib/caliper.jar