From 5811848a7b273771e85a72fcdd3bf0aca1965fcd Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 2 Oct 2018 12:51:55 +0300 Subject: [PATCH] Android: Remove old support for gdbserver Change-Id: I6d2e8abf0baa5606ad3d79cc7f1f57813e8255b1 Reviewed-by: BogDan Vatra Reviewed-by: Vikas Pachdha --- src/plugins/android/androidrunnerworker.cpp | 27 +++------------------ 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index b932e372a4a..648a0d363d4 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -425,36 +425,17 @@ void AndroidRunnerWorker::asyncStartHelper() // e.g. on Android 8 with NDK 10e runAdb({"shell", "run-as", m_packageName, "chmod", "a+x", packageDir}); - QString gdbServerExecutable; - QString gdbServerPrefix = "./lib/"; - if (!runAdb({"shell", "run-as", m_packageName, "ls", "lib/"})) { - if (m_gdbserverPath.isEmpty()) { - emit remoteProcessFinished(tr("Failed to get process path. Reason: %1.").arg(m_lastRunAdbError)); - return; - } - uploadFile(m_gdbserverPath, "gdbserver"); - runAdb({"shell", "run-as", m_packageName, "ls"}); - gdbServerPrefix = "./"; - } - - for (const auto &line: m_lastRunAdbRawOutput.split('\n')) { - if (line.indexOf("gdbserver") != -1/* || line.indexOf("lldb-server") != -1*/) { - gdbServerExecutable = QString::fromUtf8(line.trimmed()); - break; - } - } - - if (gdbServerExecutable.isEmpty()) { - emit remoteProcessFinished(tr("Cannot find C++ debugger.")); + if (m_gdbserverPath.isEmpty() || !uploadFile(m_gdbserverPath, "gdbserver")) { + emit remoteProcessFinished(tr("Can not find/copy C++ debug server.")); return; } QString gdbServerSocket = packageDir + "/debug-socket"; - runAdb({"shell", "run-as", m_packageName, "killall", gdbServerExecutable}); + runAdb({"shell", "run-as", m_packageName, "killall", "gdbserver"}); runAdb({"shell", "run-as", m_packageName, "rm", gdbServerSocket}); std::unique_ptr gdbServerProcess(new QProcess, deleter); gdbServerProcess->start(m_adb, selector() << "shell" << "run-as" - << m_packageName << gdbServerPrefix + gdbServerExecutable + << m_packageName << "./gdbserver" << "--multi" << "+" + gdbServerSocket); if (!gdbServerProcess->waitForStarted()) { emit remoteProcessFinished(tr("Failed to start C++ debugger."));