diff options
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 2 | ||||
| -rw-r--r-- | runtime/jdwp_provider.h | 23 | ||||
| -rw-r--r-- | runtime/runtime.cc | 8 | ||||
| -rw-r--r-- | runtime/runtime_options.def | 2 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 3 |
5 files changed, 4 insertions, 34 deletions
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index a52e16328a..235a2aa90e 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -371,7 +371,7 @@ TEST_F(CmdlineParserTest, DISABLED_TestXGcOption) { */ TEST_F(CmdlineParserTest, TestJdwpProviderEmpty) { { - EXPECT_SINGLE_PARSE_DEFAULT_VALUE(JdwpProvider::kUnset, "", M::JdwpProvider); + EXPECT_SINGLE_PARSE_DEFAULT_VALUE(JdwpProvider::kNone, "", M::JdwpProvider); } } // TEST_F diff --git a/runtime/jdwp_provider.h b/runtime/jdwp_provider.h index c4f19899c9..698fdc086d 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 @@ namespace art { 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 diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 7efd000f33..1e327fc8ed 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1283,8 +1283,7 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { dump_gc_performance_on_shutdown_ = runtime_options.Exists(Opt::DumpGCPerformanceOnShutdown); jdwp_options_ = runtime_options.GetOrDefault(Opt::JdwpOptions); - jdwp_provider_ = CanonicalizeJdwpProvider(runtime_options.GetOrDefault(Opt::JdwpProvider), - IsJavaDebuggable()); + jdwp_provider_ = runtime_options.GetOrDefault(Opt::JdwpProvider); switch (jdwp_provider_) { case JdwpProvider::kNone: { VLOG(jdwp) << "Disabling all JDWP support."; @@ -1318,11 +1317,6 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { constexpr const char* plugin_name = kIsDebugBuild ? "libadbconnectiond.so" : "libadbconnection.so"; plugins_.push_back(Plugin::Create(plugin_name)); - break; - } - case JdwpProvider::kUnset: { - LOG(FATAL) << "Illegal jdwp provider " << jdwp_provider_ << " was not filtered out!"; - break; } } callbacks_->AddThreadLifecycleCallback(Dbg::GetThreadLifecycleCallback()); diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def index 3f9a3229ca..e647423b9c 100644 --- a/runtime/runtime_options.def +++ b/runtime/runtime_options.def @@ -44,7 +44,7 @@ RUNTIME_OPTIONS_KEY (std::string, Image) 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 diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 713fd35523..1ba433e974 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -377,9 +377,6 @@ CHROOT_DEX_LOCATION="$CHROOT$DEX_LOCATION" if [ "$USE_JVM" = "n" ]; then FLAGS="${FLAGS} ${ANDROID_FLAGS}" - # we don't want to be trying to get adbconnections since the plugin might - # not have been built. - FLAGS="${FLAGS} -XjdwpProvider:none" for feature in ${EXPERIMENTAL}; do FLAGS="${FLAGS} -Xexperimental:${feature} -Xcompiler-option --runtime-arg -Xcompiler-option -Xexperimental:${feature}" COMPILE_FLAGS="${COMPILE_FLAGS} --runtime-arg -Xexperimental:${feature}" |