Revert "Revert "More Makefile fun for --debuggable.""
This reverts commit 9728a930fdf717cca60b48d9c2b715d0eed497fd.
Change-Id: Ieca964a793e58f11931f78f50be47a4a9f0dc21f
diff --git a/test/run-test b/test/run-test
index 52f5e0c..2950af1 100755
--- a/test/run-test
+++ b/test/run-test
@@ -147,6 +147,9 @@
run_args="${run_args} --prebuild"
prebuild_mode="yes"
shift;
+ elif [ "x$1" = "x--debuggable" ]; then
+ run_args="${run_args} -Xcompiler-option --debuggable"
+ shift;
elif [ "x$1" = "x--no-prebuild" ]; then
run_args="${run_args} --no-prebuild"
prebuild_mode="no"
@@ -431,6 +434,7 @@
echo " -Xcompiler-option Pass an option to the compiler."
echo " --runtime-option Pass an option to the runtime."
echo " --debug Wait for a debugger to attach."
+ echo " --debuggable Whether to compile Java code for a debugger."
echo " --gdb Run under gdb; incompatible with some tests."
echo " --build-only Build test files only (off by default)."
echo " --interpreter Enable interpreter only mode (off by default)."
@@ -464,7 +468,7 @@
echo " --gcverify Run with gc verification"
echo " --always-clean Delete the test files even if the test fails."
echo " --android-root [path] The path on target for the android root. (/system by default)."
- echo " --dex2oat-swap Use a dex2oat swap file."
+ echo " --dex2oat-swap Use a dex2oat swap file."
) 1>&2
exit 1
fi