Move HaveHelpFlag out of flag_parser

It's only used by the cvd command, so moved it there.

Author: jemoreira

base/cvd/cuttlefish/flag_parser/flag_parser.cpp

@@ -49,18 +49,6 @@ namespace cuttlefish {
 
 namespace {
 
-/*
- * From external/gflags/src, commit:
- *  061f68cd158fa658ec0b9b2b989ed55764870047
- *
- */
-constexpr std::array help_bool_opts{
-    "help", "helpfull", "helpshort", "helppackage", "helpxml", "version", "h"};
-constexpr std::array help_str_opts{
-    "helpon",
-    "helpmatch",
-};
-
 bool ShouldBeNullOpt(std::string_view value, CoerceToNullopt opt) {
   switch (opt) {
     case CoerceToNullopt::None:
@@ -780,21 +768,4 @@ Flag GflagsCompatFlag(const std::string& name,
   return GflagsCompatFlagImpl(name, value, opt);
 }
 
-Result<bool> HasHelpFlag(const std::vector<std::string>& args) {
-  std::vector<std::string> copied_args(args);
-  std::vector<Flag> flags;
-  flags.reserve(help_bool_opts.size() + help_str_opts.size());
-  bool bool_value_placeholder = false;
-  std::string str_value_placeholder;
-  for (const auto bool_opt : help_bool_opts) {
-    flags.emplace_back(GflagsCompatFlag(bool_opt, bool_value_placeholder));
-  }
-  for (const auto str_opt : help_str_opts) {
-    flags.emplace_back(GflagsCompatFlag(str_opt, str_value_placeholder));
-  }
-  CF_EXPECT(ConsumeFlags(flags, copied_args));
-  // if there was any match, some in copied_args were consumed.
-  return (args.size() != copied_args.size());
-}
-
 }  // namespace cuttlefish

base/cvd/cuttlefish/flag_parser/flag_parser.h

@@ -220,7 +220,5 @@ Flag GflagsCompatFlag(
     const std::string& name, std::optional<std::vector<unsigned>>& value,
     CoerceToNullopt opt = CoerceToNullopt::None);
 
-// e.g. cvd start --help, cvd stop -help, cvd fleet -h
-Result<bool> HasHelpFlag(const std::vector<std::string>& args);
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/cvd/BUILD.bazel

@@ -12,7 +12,6 @@ cf_cc_library(
     copts = COPTS + ["-Werror=sign-compare"],
     deps = [
         "//cuttlefish/common/libs/utils:environment",
-        "//cuttlefish/flag_parser",
         "//cuttlefish/host/commands/cvd/cli:command_request",
         "//cuttlefish/host/commands/cvd/cli:frontline_parser",
         "//cuttlefish/host/commands/cvd/cli:nesting_commands",
@@ -33,9 +32,9 @@ cf_cc_binary(
         ":libcvd",
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/flag_parser",
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/common/libs/utils:tee_logging",
+        "//cuttlefish/flag_parser",
         "//cuttlefish/host/commands/cvd/cli:log_files",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/commands/cvd/version",

base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel

@@ -112,9 +112,9 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/flag_parser",
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/common/libs/utils:users",
+        "//cuttlefish/flag_parser",
         "//cuttlefish/host/commands/cvd/cli:command_request",
         "//cuttlefish/host/commands/cvd/cli:help_format",
         "//cuttlefish/host/commands/cvd/cli:types",
@@ -183,11 +183,11 @@ cf_cc_library(
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/flag_parser",
         "//cuttlefish/common/libs/utils:gflags_xml_parser",
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/common/libs/utils:subprocess_managed_stdio",
         "//cuttlefish/common/libs/utils:users",
+        "//cuttlefish/flag_parser",
         "//cuttlefish/host/commands/cvd/instances:config_path",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/libs/config:config_constants",

base/cvd/cuttlefish/host/commands/cvd/cli/command_request.cpp

@@ -23,13 +23,27 @@
 
 #include <android-base/file.h>
 
-#include "cuttlefish/flag_parser/flag_parser.h"
 #include "cuttlefish/host/commands/cvd/cli/command_request.h"
 #include "cuttlefish/host/commands/cvd/cli/selector/selector_common_parser.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
 
+namespace {
+
+/*
+ * From external/gflags/src, commit:
+ *  061f68cd158fa658ec0b9b2b989ed55764870047
+ *
+ */
+constexpr std::array help_bool_opts{
+    "help", "helpfull", "helpshort", "helppackage", "helpxml", "version", "h"};
+constexpr std::array help_str_opts{
+    "helpon",
+    "helpmatch",
+};
+
+}  // namespace
 CommandRequest::CommandRequest(cvd_common::Args args, cvd_common::Envs env,
                                selector::SelectorOptions selectors)
     : args_(std::move(args)),
@@ -93,4 +107,21 @@ Result<CommandRequest> CommandRequestBuilder::Build() && {
                         std::move(selector_options_));
 }
 
+Result<bool> HasHelpFlag(const std::vector<std::string>& args) {
+  std::vector<std::string> copied_args(args);
+  std::vector<Flag> flags;
+  flags.reserve(help_bool_opts.size() + help_str_opts.size());
+  bool bool_value_placeholder = false;
+  std::string str_value_placeholder;
+  for (const auto bool_opt : help_bool_opts) {
+    flags.emplace_back(GflagsCompatFlag(bool_opt, bool_value_placeholder));
+  }
+  for (const auto str_opt : help_str_opts) {
+    flags.emplace_back(GflagsCompatFlag(str_opt, str_value_placeholder));
+  }
+  CF_EXPECT(ConsumeFlags(flags, copied_args));
+  // if there was any match, some in copied_args were consumed.
+  return (args.size() != copied_args.size());
+}
+
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/cvd/cli/command_request.h

@@ -105,4 +105,7 @@ class CommandRequestBuilder {
   selector::SelectorOptions selector_options_;
 };
 
+// e.g. cvd start --help, cvd stop -help, cvd fleet -h
+Result<bool> HasHelpFlag(const std::vector<std::string>& args);
+
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/cvd/cvd.cpp

@@ -21,7 +21,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "cuttlefish/flag_parser/flag_parser.h"
 #include "cuttlefish/host/commands/cvd/cli/command_request.h"
 #include "cuttlefish/host/commands/cvd/cli/frontline_parser.h"
 #include "cuttlefish/host/commands/cvd/cli/request_context.h"