diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-01-11 14:49:11 +0200 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-01-15 15:28:38 +0000 |
commit | 25a33686ff370c70dbf4220b1bca618c057953cf (patch) | |
tree | 7c772f331e7c21a63849b882a5b9d0894f0db41a | |
parent | 69984af8d5465feb9532823f112f322d5404cc15 (diff) | |
download | qttools-25a33686ff370c70dbf4220b1bca618c057953cf.tar.gz |
Android: copy the right gdbserver on arm64-v8a
Task-number: QTBUG-50394
Change-Id: I5ea12a3b1c3ab53cd5308b32b0bb4b8075a705f2
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-rw-r--r-- | src/androiddeployqt/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index aed46ed14..d8d5e32d2 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -2762,7 +2762,9 @@ bool copyGdbServer(const Options &options) fprintf(stdout, "Copying gdbserver into package.\n"); QString architectureSubDirectory; - if (options.architecture.startsWith(QLatin1String("arm"))) + if (options.architecture == QLatin1String("arm64-v8a")) + architectureSubDirectory = QLatin1String("android-arm64"); + else if (options.architecture.startsWith(QLatin1String("arm"))) architectureSubDirectory = QLatin1String("android-arm"); else architectureSubDirectory = QLatin1String("android-") + options.architecture; |