1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index ae43200d8d..496e0eceea 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -64,7 +64,7 @@ public:
     void handleJdbSettled();
 
 signals:
-    void remoteProcessStarted(Utils::Port gdbServerPort, const QUrl &qmlServer, qint64 pid);
+    void remoteProcessStarted(Utils::Port debugServerPort, const QUrl &qmlServer, qint64 pid);
     void remoteProcessFinished(const QString &errString = QString());
 
     void remoteOutput(const QString &output);
@@ -72,11 +72,10 @@ signals:
 
 private:
     void asyncStartHelper();
-    bool startDebuggerServer(const QString &packageDir, const QString &gdbServerPrefix,
-                             const QString &gdbServerExecutable, QString *errorStr = nullptr);
+    bool startDebuggerServer(const QString &packageDir, const QString &debugServerFile, QString *errorStr = nullptr);
     bool deviceFileExists(const QString &filePath);
     bool packageFileExists(const QString& filePath);
-    bool uploadGdbServer();
+    bool uploadDebugServer(const QString &debugServerFileName);
 
     enum class JDBState {
         Idle,
@@ -98,21 +97,21 @@ private:
     std::unique_ptr<QProcess, Deleter> m_psIsAlive;
     QByteArray m_stdoutBuffer;
     QByteArray m_stderrBuffer;
-    QRegExp m_logCatRegExp;
     QFuture<qint64> m_pidFinder;
     bool m_useCppDebugger = false;
+    bool m_useLldb = false; // FIXME: Un-implemented currently.
     QmlDebug::QmlDebugServicesPreset m_qmlDebugServices;
-    Utils::Port m_localGdbServerPort; // Local end of forwarded debug socket.
+    Utils::Port m_localDebugServerPort; // Local end of forwarded debug socket.
     QUrl m_qmlServer;
     JDBState m_jdbState = JDBState::Idle;
     Utils::Port m_localJdbServerPort;
-    std::unique_ptr<QProcess, Deleter> m_gdbServerProcess;
+    std::unique_ptr<QProcess, Deleter> m_debugServerProcess; // gdbserver or lldb-server
     std::unique_ptr<QProcess, Deleter> m_jdbProcess;
     QString m_deviceSerialNumber;
     int m_apiLevel = -1;
     QString m_extraAppParams;
     Utils::Environment m_extraEnvVars;
-    QString m_gdbserverPath;
+    QString m_debugServerPath;
     bool m_useAppParamsForQmlDebugger = false;
 };