commit 01cc9101b618696f7f797855f7ef5393c6664e1a
author Alex Light <allight@google.com> Thu Feb 04 16:53:40 2021 -0800
committer Alex Light <allight@google.com> Wed Feb 10 01:48:23 2021 +0000
tree 3d3cfc97f2e37e055696c05df9614e07cb13c56d
parent 60117aeeffda3d01a5314984694ae3d6d4588fc1

Quiet unneeded warning about jdwp

A recent change gave -XjdwpOptions a default value value. This made
the runtime print a (non-fatal) warning if started without jdwp
support telling the user the option is being ignored. Make this
warning only print when the jdwpOptions are explicitly given.

Test: ./art/test/run-test --host --dev 001-HelloWorld
Change-Id: Ie61f3d32462a6b8379d5916ccce37abbc7783d9a

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 2eeb373..55f4eeb 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1448,6 +1448,7 @@
 
   dump_gc_performance_on_shutdown_ = runtime_options.Exists(Opt::DumpGCPerformanceOnShutdown);
 
+  bool has_explicit_jdwp_options = runtime_options.Get(Opt::JdwpOptions) != nullptr;
   jdwp_options_ = runtime_options.GetOrDefault(Opt::JdwpOptions);
   jdwp_provider_ = CanonicalizeJdwpProvider(runtime_options.GetOrDefault(Opt::JdwpProvider),
                                             IsJavaDebuggable());
@@ -1458,11 +1459,13 @@
         bool has_transport = jdwp_options_.find("transport") != std::string::npos;
         std::string adb_connection_args =
             std::string("  -XjdwpProvider:adbconnection -XjdwpOptions:") + jdwp_options_;
-        LOG(WARNING) << "Jdwp options given when jdwp is disabled! You probably want to enable "
-                     << "jdwp with one of:" << std::endl
-                     << "  -Xplugin:libopenjdkjvmti" << (kIsDebugBuild ? "d" : "") << ".so "
-                     << "-agentpath:libjdwp.so=" << jdwp_options_ << std::endl
-                     << (has_transport ? "" : adb_connection_args);
+        if (has_explicit_jdwp_options) {
+          LOG(WARNING) << "Jdwp options given when jdwp is disabled! You probably want to enable "
+                      << "jdwp with one of:" << std::endl
+                      << "  -Xplugin:libopenjdkjvmti" << (kIsDebugBuild ? "d" : "") << ".so "
+                      << "-agentpath:libjdwp.so=" << jdwp_options_ << std::endl
+                      << (has_transport ? "" : adb_connection_args);
+        }
       }
       break;
     }