Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00908cea authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Adding flag to disable fastboot_info" into main am: e259c2dc am:... 

Merge "Adding flag to disable fastboot_info" into main am: e259c2dc am: 01f20c8e am: 72608436 am: f7f72e34

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2648440



Change-Id: If99b5bdb2e8bf03d8456070765d8167e53330bc7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents affa0b0c f7f72e34

fastboot/fastboot.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2213,6 +2213,7 @@ int FastBootTool::Main(int argc, char* argv[]) { 
                                      {"disable-verification", no_argument, 0, 0},

                                      {"disable-verity", no_argument, 0, 0},

                                      {"disable-super-optimization", no_argument, 0, 0},

                                      {"disable-fastboot-info", no_argument, 0, 0},

                                      {"force", no_argument, 0, 0},

                                      {"fs-options", required_argument, 0, 0},

                                      {"header-version", required_argument, 0, 0},
@@ -2253,6 +2254,8 @@ int FastBootTool::Main(int argc, char* argv[]) { 
                g_disable_verity = true;

            } else if (name == "disable-super-optimization") {

                fp->should_optimize_flash_super = false;

            } else if (name == "disable-fastboot-info") {

                fp->should_use_fastboot_info = false;

            } else if (name == "force") {

                fp->force_flash = true;

            } else if (name == "fs-options") {