From 4650d4a37d6fa65dff936df2c8696aa98b072883 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Wed, 24 Jan 2018 00:33:49 +0000 Subject: Revert "Change default dalvik.vm.jdwp-provider to adbconnection" If DDMS is being used on a userdebug or eng build it will cause the libjdwp agent to be loaded on various system processes, most notably system_server. This will cause a massive performance hit as it tries to force system_server to jit but, due to security policies, it is forced to interpreter instead. Until this can be fixed we are changing the default back to the internal jdwp provider. This reverts commit a76605a4bbe93b79aa28a85cdc4a2aeac869c1ca. Bug: 72381923 Bug: 72400642 Bug: 72336488 Test: Boot userdebug with ddms monitor running. Reason for revert: DDMS forcing system_server to interpreter causing massive perf problems on userdebug builds. Change-Id: I11e8397ecd6239f0e2b2ff0f8c05dad996707a65 --- cmdline/cmdline_parser_test.cc | 2 +- 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 : CmdlineTypeParser { "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); -- cgit v1.2.3-59-g8ed1b