commit 264a486a05e832889b17dd2bbad2d9c6588c3603
author Alex Light <allight@google.com> Wed Jan 31 16:47:58 2018 +0000
committer Alex Light <allight@google.com> Wed Jan 31 09:48:16 2018 -0800
tree f6aa966402cf3678ceaac8a7d4c13ee35097ecc4
parent f346af51a5d44ee0a3cd26e7e0e1b28ec1c5579f

Revert "Revert "Make the runtime default to not allowing JDWP again.""

This reverts commit f05c32008de16f669ea8323c4e17beef1df92d20.

We need to change the arguments passed from run-jdwp-tests.sh in some
situations.

Reason for revert: Fixed issue causing go/art-build to fail.

Test: ./art/tools/run-jdwp-tests.sh --mode=host
Bug: 72400560

Change-Id: I2be260479816e3a48df5cb65bba25858750df4db

runtime/runtime_options.def

diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def
index 6e1a68b..e78d952 100644
--- a/runtime/runtime_options.def
+++ b/runtime/runtime_options.def
@@ -44,7 +44,7 @@
 RUNTIME_OPTIONS_KEY (Unit,                CheckJni)
 RUNTIME_OPTIONS_KEY (Unit,                JniOptsForceCopy)
 RUNTIME_OPTIONS_KEY (std::string,         JdwpOptions, "")
-RUNTIME_OPTIONS_KEY (JdwpProvider,        JdwpProvider, JdwpProvider::kInternal)
+RUNTIME_OPTIONS_KEY (JdwpProvider,        JdwpProvider,                   JdwpProvider::kNone)
 RUNTIME_OPTIONS_KEY (MemoryKiB,           MemoryMaximumSize,              gc::Heap::kDefaultMaximumSize)  // -Xmx
 RUNTIME_OPTIONS_KEY (MemoryKiB,           MemoryInitialSize,              gc::Heap::kDefaultInitialSize)  // -Xms
 RUNTIME_OPTIONS_KEY (MemoryKiB,           HeapGrowthLimit)                // Default is 0 for unlimited