Merge "Clarify 'fastboot flash' help."

am: f90137da60

Change-Id: I092853ae3789730989125b09707958da1a6fd2c7
This commit is contained in:
Elliott Hughes 2018-05-24 22:21:43 -07:00 committed by android-build-merger
commit 06d71a71fa

View file

@ -316,7 +316,8 @@ static void syntax_error(const char* fmt, ...) {
static int show_help() { static int show_help() {
// clang-format off // clang-format off
fprintf(stdout, fprintf(stdout,
/* 1234567890123456789012345678901234567890123456789012345678901234567890123456 */ // 1 2 3 4 5 6 7 8
// 12345678901234567890123456789012345678901234567890123456789012345678901234567890
"usage: fastboot [OPTION...] COMMAND...\n" "usage: fastboot [OPTION...] COMMAND...\n"
"\n" "\n"
"flashing:\n" "flashing:\n"
@ -324,8 +325,8 @@ static int show_help() {
" flashall Flash all partitions from $ANDROID_PRODUCT_OUT.\n" " flashall Flash all partitions from $ANDROID_PRODUCT_OUT.\n"
" On A/B devices, flashed slot is set as active.\n" " On A/B devices, flashed slot is set as active.\n"
" Secondary images may be flashed to inactive slot.\n" " Secondary images may be flashed to inactive slot.\n"
" flash PARTITION [FILENAME]\n" " flash PARTITION [FILENAME] Flash given partition, using the image from\n"
" Flash given partition only.\n" " $ANDROID_PRODUCT_OUT if no filename is given.\n"
"\n" "\n"
"basics:\n" "basics:\n"
" devices [-l] List devices in bootloader (-l: with device paths).\n" " devices [-l] List devices in bootloader (-l: with device paths).\n"