forked from qt-creator/qt-creator
Android: Also try to kill lldb-server before starting
... and report upload errors. Change-Id: I87b978290a1a6c74b63195d0e1724b1da6342b38 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
@@ -517,7 +517,11 @@ void AndroidRunnerWorker::asyncStartHelper()
|
||||
QString debugServerFile;
|
||||
if (m_useLldb) {
|
||||
debugServerFile = "./lldb-server";
|
||||
uploadDebugServer(debugServerFile);
|
||||
runAdb({"shell", "run-as", m_packageName, "killall", "lldb-server"});
|
||||
if (!uploadDebugServer(debugServerFile)) {
|
||||
emit remoteProcessFinished(tr("Cannot copy C++ debug server."));
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (packageFileExists("./lib/gdbserver")) {
|
||||
debugServerFile = "./lib/gdbserver";
|
||||
|
Reference in New Issue
Block a user