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

Commit 672482ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fastboot: Introduce FASTBOOT_DEVICE alias for ANDROID_SERIAL... 

Merge "fastboot: Introduce FASTBOOT_DEVICE alias for ANDROID_SERIAL environment variable" am: 929a665f am: a5d6d550

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



Change-Id: I51cb02eacb3efe0933310c084ee0f0a24f8926bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04147b86 a5d6d550

fastboot/fastboot.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2231,6 +2231,8 @@ int FastBootTool::Main(int argc, char* argv[]) { 
                                      {"version", no_argument, 0, 0},

                                      {0, 0, 0, 0}};



    serial = getenv("FASTBOOT_DEVICE");

    if (!serial)

        serial = getenv("ANDROID_SERIAL");



    int c;