diff options
| author | 2018-01-24 14:05:32 +0000 | |
|---|---|---|
| committer | 2018-01-24 14:05:32 +0000 | |
| commit | e714e96e78bfdf6c608fdc01de45515e73fa2a8d (patch) | |
| tree | 88c591c92b1f4e0b08f0db3b0e49ed712dcaca24 | |
| parent | b95eb37a04874a57046fba7fc09a8b197691e9a2 (diff) | |
| parent | 4650d4a37d6fa65dff936df2c8696aa98b072883 (diff) | |
Merge "Revert "Change default dalvik.vm.jdwp-provider to adbconnection""
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 2 | ||||
| -rw-r--r-- | cmdline/cmdline_types.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index 70cc07eff0..5d672061df 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -375,7 +375,7 @@ TEST_F(CmdlineParserTest, TestJdwpProviderEmpty) { TEST_F(CmdlineParserTest, TestJdwpProviderDefault) { const char* opt_args = "-XjdwpProvider:default"; - EXPECT_SINGLE_PARSE_VALUE(JdwpProvider::kAdbConnection, opt_args, M::JdwpProvider); + EXPECT_SINGLE_PARSE_VALUE(JdwpProvider::kInternal, opt_args, M::JdwpProvider); } // TEST_F TEST_F(CmdlineParserTest, TestJdwpProviderInternal) { diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h index 2bc7409bb6..d0d6bfd3ce 100644 --- a/cmdline/cmdline_types.h +++ b/cmdline/cmdline_types.h @@ -77,10 +77,10 @@ struct CmdlineType<JdwpProvider> : CmdlineTypeParser<JdwpProvider> { "Example: -XjdwpProvider:internal for internal jdwp implementation\n" "Example: -XjdwpProvider:adbconnection for adb connection mediated jdwp implementation\n" "Example: -XjdwpProvider:default for the default jdwp implementation" - " (currently adbconnection)\n"); - } else if (option == "internal") { + " (currently internal)\n"); + } else if (option == "internal" || option == "default") { return Result::Success(JdwpProvider::kInternal); - } else if (option == "adbconnection" || option == "default") { + } else if (option == "adbconnection") { return Result::Success(JdwpProvider::kAdbConnection); } else if (option == "none") { return Result::Success(JdwpProvider::kNone); |