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

Android: Simplify debug server upload

Browse Source 
Change-Id: Ib5fad98e71c29e3b28c9ba206fe20a38a75a471e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2020-05-18 15:54:19 +02:00
parent f3038bce08
commit 08734e2ea0
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@
#include <QDirIterator> #include <QDirIterator>
#include <QFileInfo> #include <QFileInfo>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QScopeGuard>
#include <QTcpServer> #include <QTcpServer>
#include <QThread> #include <QThread>
@@ -342,34 +343,30 @@ bool AndroidRunnerWorker::uploadDebugServer(const QString &debugServerFileName)
// the files can't be pushed directly to package because of permissions. // the files can't be pushed directly to package because of permissions.
qCDebug(androidRunWorkerLog) << "Uploading GdbServer"; qCDebug(androidRunWorkerLog) << "Uploading GdbServer";
bool foundUnique = true;
auto cleanUp = [this, &foundUnique] (QString *p) {
if (foundUnique && !runAdb({"shell", "rm", "-f", *p}))
qCDebug(androidRunWorkerLog) << "Gdbserver cleanup failed.";
delete p;
};
std::unique_ptr<QString, decltype (cleanUp)>
tempGdbServerPath(new QString("/data/local/tmp/%1"), cleanUp);
// Get a unique temp file name for gdb/lldbserver copy // Get a unique temp file name for gdb/lldbserver copy
const QString tempDebugServerPathTemplate = "/data/local/tmp/%1";
int count = 0; int count = 0;
while (deviceFileExists(tempGdbServerPath->arg(++count))) { while (deviceFileExists(tempDebugServerPathTemplate.arg(++count))) {
if (count > GdbTempFileMaxCounter) { if (count > GdbTempFileMaxCounter) {
qCDebug(androidRunWorkerLog) << "Can not get temporary file name"; qCDebug(androidRunWorkerLog) << "Can not get temporary file name";
foundUnique = false;
return false; return false;
} }
} }
*tempGdbServerPath = tempGdbServerPath->arg(count);
const QString tempDebugServerPath = tempDebugServerPathTemplate.arg(count);
auto cleanUp = qScopeGuard([this, tempDebugServerPath] {
if (!runAdb({"shell", "rm", "-f", tempDebugServerPath}))
qCDebug(androidRunWorkerLog) << "Debug server cleanup failed.";
});
// Copy gdbserver to temp location // Copy gdbserver to temp location
if (!runAdb({"push", m_debugServerPath , *tempGdbServerPath})) { if (!runAdb({"push", m_debugServerPath , tempDebugServerPath})) {
qCDebug(androidRunWorkerLog) << "Gdbserver upload to temp directory failed"; qCDebug(androidRunWorkerLog) << "Debug server upload to temp directory failed";
return false; return false;
} }
// Copy gdbserver from temp location to app directory // Copy gdbserver from temp location to app directory
if (!runAdb({"shell", "run-as", m_packageName, "cp" , *tempGdbServerPath, debugServerFileName})) { if (!runAdb({"shell", "run-as", m_packageName, "cp" , tempDebugServerPath, debugServerFileName})) {
qCDebug(androidRunWorkerLog) << "Debug server copy from temp directory failed"; qCDebug(androidRunWorkerLog) << "Debug server copy from temp directory failed";
return false; return false;
} }