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

Android: Fix gdbserver upload for Windows when using Armv8 arch

Browse Source 
The gdbserver is not uploaded to device for armv7 as lib symlink
is available and we can use the gdbserver packaged with the apk

Task-number: QTCREATORBUG-21317
Change-Id: I263eb48bbf3cf05b969db934a928185dba10373b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Vikas Pachdha
2018-12-20 18:40:34 +01:00
parent d886285ff0
commit 59de3fcb64
2 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidrunnerworker.h
View File

@@ -48,7 +48,6 @@ public:
~AndroidRunnerWorker() override;
bool adbShellAmNeedsQuotes();
bool runAdb(const QStringList &args, int timeoutS = 10, const QByteArray &writeData = {});
bool uploadFile(const QString &from, const QString &to, const QString &flags = QString("+x"));
void adbKill(qint64 pid);
QStringList selector() const;
void forceStop();
@@ -71,8 +70,11 @@ signals:
void remoteOutput(const QString &output);
void remoteErrorOutput(const QString &output);
protected:
private:
void asyncStartHelper();
bool deviceFileExists(const QString &filePath);
bool packageFileExists(const QString& filePath);
bool uploadGdbServer();
enum class JDBState {
Idle,