commit fb57a6528d73e6ddbccf3049f08f6fa400e6dcd1
author Nicolas Geoffray <ngeoffray@google.com> Fri Jun 08 09:40:19 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jun 08 09:40:19 2018 +0000
tree e334f68df51c6078fd51f293a38146c6fcb6c106
parent 7b39a39258311ad6c3da5934746a186c185c3f4f

Revert "Revert^2 "Make adbconnection start automatically for debuggable apps (on target)""

This reverts commit 7b39a39258311ad6c3da5934746a186c185c3f4f.

Fails jdwp tests on target.

Bug: 109505014
Change-Id: Ib8a278bc8c8137e1f1397e3e881d652504fea96f

runtime/runtime_options.def

diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def
index 3f9a322..e647423 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::kUnset)
+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