commit 34912505e92967b503cd61f81c87e0d9aaae7bc2
author Googler <lberki@google.com> Tue Jan 30 23:36:58 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 30 23:38:21 2024 -0800
tree 1c3302ab1ca5bb6e3d82b3972e6b6f27708bc8d2
parent a4c3d899212bb216abe3789a13657e7413a3eefc

Remove all traces of the --host_jvm_profile command line argument.

RELNOTES[INC]: The --host_jvm_profile command line argument is not supported anymore.

PiperOrigin-RevId: 602952190
Change-Id: I360f875d0783a7f9b8b8cc1ad8e6bd496dab831c

src/main/cpp/blaze.cc

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 128104d..22b844a 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -488,9 +488,6 @@
   if (startup_options.host_jvm_debug) {
     result.push_back("--host_jvm_debug");
   }
-  if (!startup_options.host_jvm_profile.empty()) {
-    result.push_back("--host_jvm_profile=" + startup_options.host_jvm_profile);
-  }
   if (!startup_options.host_jvm_args.empty()) {
     for (const auto &arg : startup_options.host_jvm_args) {
       result.push_back("--host_jvm_args=" + arg);

src/main/cpp/startup_options.cc

diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index d1e2f08..8fb001e 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -277,10 +277,6 @@
              nullptr) {
     failure_detail_out = blaze_util::Path(blaze::AbsolutePathFromFlag(value));
     option_sources["failure_detail_out"] = rcfile;
-  } else if ((value = GetUnaryOption(arg, next_arg, "--host_jvm_profile")) !=
-             nullptr) {
-    host_jvm_profile = value;
-    option_sources["host_jvm_profile"] = rcfile;
   } else if ((value = GetUnaryOption(arg, next_arg, "--server_javabase")) !=
              nullptr) {
     // TODO(bazel-team): Consider examining the javabase and re-execing in case

src/main/cpp/startup_options.h

diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h
index 208e4bc..7fdb1b4 100644
--- a/src/main/cpp/startup_options.h
+++ b/src/main/cpp/startup_options.h
@@ -167,8 +167,6 @@
 
   bool autodetect_server_javabase;
 
-  std::string host_jvm_profile;
-
   std::vector<std::string> host_jvm_args;
 
   bool batch;

src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java
index eae86b4..f74bd83 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java
@@ -49,15 +49,6 @@
   public List<String> hostJvmArgs;
 
   @Option(
-      name = "host_jvm_profile",
-      defaultValue = "", // NOTE: purely decorative!  See BlazeServerStartupOptions.
-      valueHelp = "<profiler_name>",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.NO_OP},
-      help = "Deprecated no-op.")
-  public String hostJvmProfile;
-
-  @Option(
     name = "host_jvm_debug",
     defaultValue = "null", // NOTE: purely decorative!  See BlazeServerStartupOptions.
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,

src/test/cpp/bazel_startup_options_test.cc

diff --git a/src/test/cpp/bazel_startup_options_test.cc b/src/test/cpp/bazel_startup_options_test.cc
index 33ae9c2..e8bd85b 100644
--- a/src/test/cpp/bazel_startup_options_test.cc
+++ b/src/test/cpp/bazel_startup_options_test.cc
@@ -112,7 +112,6 @@
   ExpectIsUnaryOption(options, "connect_timeout_secs");
   ExpectIsUnaryOption(options, "digest_function");
   ExpectIsUnaryOption(options, "host_jvm_args");
-  ExpectIsUnaryOption(options, "host_jvm_profile");
   ExpectIsUnaryOption(options, "install_base");
   ExpectIsUnaryOption(options, "invocation_policy");
   ExpectIsUnaryOption(options, "io_nice_level");