cvd: start and bugreport help works everywhere#2517
Merged
jemoreira merged 4 commits intogoogle:mainfrom May 8, 2026
Merged
Conversation
Databean
approved these changes
May 6, 2026
Treat not finding cvd config as a non-fatal error. Delay finding android builds until after the help flags are handled.
The cvd start and bugreport subcommands call their cvd_internal_ counterpart with the --help flag when handling their own help flags. Given that: * The help command may run before host binaries are substituted (for example, after a new local build) * Host binaries are substituted more often than not * Flags reported by older versions of the internal bugreport and start binaries are a subset of the ones supported by the current ones The binaries from the cvd package are always used for help output. This change doesn't apply to `cvd env --help` because the internal env binary has not been migrated yet.
cvd_internal_start and cvd_internal_host_bugreport print a few logs that end up in stderr but add no value to the help output. The corresponding cvd commands drop this output when help works and print it only if the internal command fails.
Databean
approved these changes
May 7, 2026
GoogleCuttlefishTesterBot
removed
the
kokoro:force-run
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Both commands rely on
cvd_internal_startandcvd_internal_host_bugreportfor their help output. Those executables are searched for in$ANDROID_HOST_OUT/bin,$HOME/binand./bin, which means the command's help only works after building cuttlefish from source or downloading an android build from the server.This PR makes cvd use the internal binaries it uses for executable substitution, which are located in the same directory where cvd is.
Bug: b/510047667