From fad5231810cdb80397c1c09e78103c537dbf0663 Mon Sep 17 00:00:00 2001 From: "Jorge E. Moreira" Date: Fri, 17 Jul 2026 16:30:45 -0700 Subject: [PATCH] Fix cvd start --help The report_anonymous_usage_stats flag is defined in cvd start and in assemble_cvd. When cvd start loads assemble_cvd's flags it ends up duplicated causing the help handler to fail. This change removes the --report_anonymous_usage_stats flag from the list returned by assemble_cvd. Bug: b/536128817 --- base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp index 3cc0db3f348..92c25df27ed 100644 --- a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp +++ b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp @@ -319,7 +319,8 @@ Result> GetCvdInternalStartFlags( CF_EXPECT(GetSiblingCommandFlags("cvd_internal_start", env, args)); // Remove flags set by cvd and intented to be exposed to the user const std::vector to_remove = { - "daemon", "instance_nums", "num_instances", "base_instance_num"}; + "daemon", "instance_nums", "num_instances", "base_instance_num", + "report_anonymous_usage_stats"}; std::erase_if(flags, [&to_remove](Flag f) { return Contains(to_remove, f.Name()); }); return flags;