Index: source/Plugins/Platform/Android/AdbClient.cpp =================================================================== --- source/Plugins/Platform/Android/AdbClient.cpp +++ source/Plugins/Platform/Android/AdbClient.cpp @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -66,10 +67,15 @@ if (device_id.empty()) { if (connect_devices.size() != 1) - return Error("Expected a single connected device, got instead %" PRIu64, - static_cast(connect_devices.size())); - - adb.SetDeviceID(connect_devices.front()); + { + if (const char *android_serial = std::getenv("ANDROID_SERIAL")) + adb.SetDeviceID(android_serial); + else + return Error("Expected a single connected device, got instead %" PRIu64, + static_cast(connect_devices.size())); + } + else + adb.SetDeviceID(connect_devices.front()); } else {