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

Android: Remove old support for gdbserver

Browse Source 
Change-Id: I6d2e8abf0baa5606ad3d79cc7f1f57813e8255b1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
BogDan Vatra
2018-10-02 12:51:55 +03:00
parent efc851e01e
commit 5811848a7b
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,36 +425,17 @@ void AndroidRunnerWorker::asyncStartHelper()
// e.g. on Android 8 with NDK 10e // e.g. on Android 8 with NDK 10e
runAdb({"shell", "run-as", m_packageName, "chmod", "a+x", packageDir}); runAdb({"shell", "run-as", m_packageName, "chmod", "a+x", packageDir});
QString gdbServerExecutable; if (m_gdbserverPath.isEmpty() || !uploadFile(m_gdbserverPath, "gdbserver")) {
QString gdbServerPrefix = "./lib/"; emit remoteProcessFinished(tr("Can not find/copy C++ debug server."));
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."));
return; return;
} }
QString gdbServerSocket = packageDir + "/debug-socket"; 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}); runAdb({"shell", "run-as", m_packageName, "rm", gdbServerSocket});
std::unique_ptr<QProcess, Deleter> gdbServerProcess(new QProcess, deleter); std::unique_ptr<QProcess, Deleter> gdbServerProcess(new QProcess, deleter);
gdbServerProcess->start(m_adb, selector() << "shell" << "run-as" gdbServerProcess->start(m_adb, selector() << "shell" << "run-as"
<< m_packageName << gdbServerPrefix + gdbServerExecutable << m_packageName << "./gdbserver"
<< "--multi" << "+" + gdbServerSocket); << "--multi" << "+" + gdbServerSocket);
if (!gdbServerProcess->waitForStarted()) { if (!gdbServerProcess->waitForStarted()) {
emit remoteProcessFinished(tr("Failed to start C++ debugger.")); emit remoteProcessFinished(tr("Failed to start C++ debugger."));