diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2018-12-20 18:40:34 +0100 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2019-02-01 08:17:56 +0000 |
| commit | 59de3fcb6416dc0387e85a1852d1226ae507b7fe (patch) | |
| tree | 366aa2110114b3a928ce97ab39b09e6c35f7f84b /src/plugins/android/androidrunnerworker.h | |
| parent | d886285ff0f9931b39a6069bc5260cf2148757eb (diff) | |
| download | qt-creator-59de3fcb6416dc0387e85a1852d1226ae507b7fe.tar.gz | |
Android: Fix gdbserver upload for Windows when using Armv8 arch
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>
Diffstat (limited to 'src/plugins/android/androidrunnerworker.h')
| -rw-r--r-- | src/plugins/android/androidrunnerworker.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h index 18639683ae..39b25a1a29 100644 --- a/src/plugins/android/androidrunnerworker.h +++ b/src/plugins/android/androidrunnerworker.h @@ -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, |