From 54fe82258da2c4a316a2629521175d98006d00ee Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Tue, 11 Mar 2014 15:54:53 +0100 Subject: Update command line to run JDWP tests on the host Updates host command line to run JDWP tests with Art in debug mode. Also adds dependency to the art binary so it is built when running the tests. Change-Id: I2208f8cdce943b173a42ca26c36f522a6a576c7d --- jdwp/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jdwp/Android.mk b/jdwp/Android.mk index 951eb23..cb891c5 100644 --- a/jdwp/Android.mk +++ b/jdwp/Android.mk @@ -37,7 +37,8 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) #jdwp_test_runtime_target := dalvikvm -XXlib:libart.so jdwp_test_runtime_target := dalvikvm -XXlib:libartd.so -jdwp_test_runtime_host := $(ANDROID_BUILD_TOP)/art/tools/art +#jdwp_test_runtime_host := $(ANDROID_HOST_OUT)/bin/art +jdwp_test_runtime_host := $(ANDROID_HOST_OUT)/bin/art -d jdwp_test_runtime_options := jdwp_test_runtime_options += -verbose:jdwp @@ -67,7 +68,7 @@ run-jdwp-tests-target: $(TARGET_OUT_DATA)/jdwp/apache-harmony-jdwp-tests.jar $(T ifeq ($(WITH_HOST_DALVIK),true) # If this fails complaining about TestRunner, build "external/junit" manually. .PHONY: run-jdwp-tests-host -run-jdwp-tests-host: $(HOST_OUT_JAVA_LIBRARIES)/apache-harmony-jdwp-tests-hostdex.jar $(HOST_OUT_JAVA_LIBRARIES)/junit-hostdex.jar +run-jdwp-tests-host: $(HOST_OUT_EXECUTABLES)/art $(HOST_OUT_JAVA_LIBRARIES)/apache-harmony-jdwp-tests-hostdex.jar $(HOST_OUT_JAVA_LIBRARIES)/junit-hostdex.jar $(jdwp_test_runtime_host) -cp $(jdwp_test_classpath_host) \ -Djpda.settings.verbose=true \ -Djpda.settings.syncPort=34016 \ -- cgit v1.2.3