summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2014-03-12 08:07:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-12 08:07:47 +0000
commit7f6fb8c647f63fc9314fdaf9cece1c98626a3b53 (patch)
treeaeffc6b8cc274981a5f3f8344f69e708f9b7d910
parentea1c4f7712e95dc27170186f71f6ae3be1fa2098 (diff)
parent54fe82258da2c4a316a2629521175d98006d00ee (diff)
downloadapache-harmony-7f6fb8c647f63fc9314fdaf9cece1c98626a3b53.tar.gz
Merge "Update command line to run JDWP tests on the host"
-rw-r--r--jdwp/Android.mk5
1 files 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 \