diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-09-07 15:59:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-07 15:59:11 +0000 |
| commit | 6598016ff3eacaeb2d78bbbca9e1f09ec38b163f (patch) | |
| tree | 2e613afc50af9cc76b550933a959850587ec17bb | |
| parent | d45e0aa91bdd3d183fe80c50c1590e9009847d71 (diff) | |
| parent | 0692bee5a57aebfbe86f51f1ceef93adf0a2c646 (diff) | |
| download | apache-harmony-6598016ff3eacaeb2d78bbbca9e1f09ec38b163f.tar.gz | |
am 0692bee5: Merge "Support forced abi when running JDWP tests from CTS" into lmp-dev
* commit '0692bee5a57aebfbe86f51f1ceef93adf0a2c646':
Support forced abi when running JDWP tests from CTS
| -rw-r--r-- | jdwp/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/jdwp/Android.mk b/jdwp/Android.mk index 6ca6bce..dcedf1f 100644 --- a/jdwp/Android.mk +++ b/jdwp/Android.mk @@ -11,10 +11,12 @@ harmony_jdwp_test_src_files := \ #jdwp_test_runtime_target := dalvikvm -XXlib:libart.so jdwp_test_runtime_target := dalvikvm -XXlib:libartd.so -cts_jdwp_test_runtime_target := dalvikvm -XXlib:libart.so #jdwp_test_runtime_host := $(ANDROID_HOST_OUT)/bin/art jdwp_test_runtime_host := $(ANDROID_HOST_OUT)/bin/art -d +# Runtime target for CTS. We also support running with a forced abi. +cts_jdwp_test_runtime_target := dalvikvm|\#ABI\#| -XXlib:libart.so + jdwp_test_runtime_options := jdwp_test_runtime_options += -verbose:jdwp cts_jdwp_test_runtime_options := |