From 8d3fd8d0deb4e94e32f4658d2ba10f162e7046ff Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 18 May 2020 11:47:03 +0200
Subject: [PATCH] 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>
---
 src/plugins/android/androidrunnerworker.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 9b30413e8e6..849fec6781a 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -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";