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
diff --git a/runtime/jdwp_provider.h b/runtime/jdwp_provider.h
index c4f1989..698fdc0 100644
--- a/runtime/jdwp_provider.h
+++ b/runtime/jdwp_provider.h
@@ -19,7 +19,6 @@
#include <ios>
-#include "base/globals.h"
#include "base/macros.h"
#include "base/logging.h"
@@ -27,33 +26,13 @@
enum class JdwpProvider {
kNone,
- // Special value only used to denote that no explicit choice has been made by the user. This
- // should not be used and one should always call CanonicalizeJdwpProvider which will remove this
- // value before using a JdwpProvider value.
- kUnset,
kInternal,
kAdbConnection,
- // The current default provider. Used if you run -XjdwpProvider:default
+ // The current default provider
kDefaultJdwpProvider = kAdbConnection,
-
- // What we should use as provider with no options and debuggable. On host we always want to be
- // none since there is no adbd on host.
- kUnsetDebuggable = kIsTargetBuild ? kDefaultJdwpProvider : kNone,
- // What we should use as provider with no options and non-debuggable
- kUnsetNonDebuggable = kNone,
};
-inline JdwpProvider CanonicalizeJdwpProvider(JdwpProvider p, bool debuggable) {
- if (p != JdwpProvider::kUnset) {
- return p;
- }
- if (debuggable) {
- return JdwpProvider::kUnsetDebuggable;
- }
- return JdwpProvider::kUnsetNonDebuggable;
-}
-
std::ostream& operator<<(std::ostream& os, const JdwpProvider& rhs);
} // namespace art