feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Also try to kill lldb-server before starting

Browse Source 
... 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:
hjk
2020-05-18 11:47:03 +02:00
parent 4fb8bb9f06
commit 8d3fd8d0de
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidrunnerworker.cpp
View File

@@ -517,7 +517,11 @@ void AndroidRunnerWorker::asyncStartHelper()
QString debugServerFile; QString debugServerFile;
if (m_useLldb) { if (m_useLldb) {
debugServerFile = "./lldb-server"; 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 { } else {
if (packageFileExists("./lib/gdbserver")) { if (packageFileExists("./lib/gdbserver")) {
debugServerFile = "./lib/gdbserver"; debugServerFile = "./lib/gdbserver";