Read JDWP options from runtime

Allocates JDWP::JdwpOptions on the heap and copies parsed options to
avoid the need to include jdwp/jdwp.h into runtime.h file.

Also does some minor cleanup and removes the old JDWP options parsing
code that became dead code after we move it to the new command-line
parser.

Bug: 19275792
Change-Id: I71901c89fbf2cc3c1901a089e2a98b4326c6ee70

1 files changed, 6 insertions, 0 deletions

diff --git a/runtime/runtime.h b/runtime/runtime.h
index 118c838..d98eb8d 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -47,6 +47,9 @@ namespace gc {
     class GarbageCollector;
   }  // namespace collector
 }  // namespace gc
+namespace JDWP {
+  struct JdwpOptions;
+}  // namespace JDWP
 namespace mirror {
   class ArtMethod;
   class ClassLoader;
@@ -682,6 +685,9 @@ class Runtime {
   // that there's no native bridge.
   bool is_native_bridge_loaded_;
 
+  // JDWP options for debugging.
+  const JDWP::JdwpOptions* jdwp_options_;
+
   DISALLOW_COPY_AND_ASSIGN(Runtime);
 };
 std::ostream& operator<<(std::ostream& os, const Runtime::CalleeSaveType& rhs);