diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-07-29 16:25:51 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2014-07-31 16:30:28 +0200 |
| commit | b11dcfb0f185483224555c69761bb7e2280e7513 (patch) | |
| tree | 077b5e885fd3c7eafa8e833790175259dd6a2280 | |
| parent | f0d30e71e8ded49c359fd58d6659c5d9e7eadb43 (diff) | |
| download | qttools-b11dcfb0f185483224555c69761bb7e2280e7513.tar.gz | |
Android: fix zipAlign location.
Stating with android tools v23, the zipAlign tool was moved from
<android_sdk>/tools to <android_sdk>/build-tools/<build_tools_version>.
Task-number:QTBUG-40481
Change-Id: Id9207b6e382b0e79522d9fc529453ccd39aebe0d
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| -rw-r--r-- | src/androiddeployqt/main.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index b1279d672..6c5ae31c8 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -126,6 +126,7 @@ struct Options // External tools QString sdkPath; + QString sdkBuildToolsVersion; QString ndkPath; QString antTool; QString jdkPath; @@ -634,13 +635,20 @@ bool readInputFile(Options *options) return false; } else { if (!QDir(options->sdkPath + QLatin1String("/platforms/") + options->androidPlatform).exists()) { - fprintf(stderr, "Warning: Android platform '%s' does not exist in NDK.\n", + fprintf(stderr, "Warning: Android platform '%s' does not exist in SDK.\n", qPrintable(options->androidPlatform)); } } } { + + QJsonValue value = jsonObject.value("sdkBuildToolsRevision"); + if (!value.isUndefined()) + options->sdkBuildToolsVersion = value.toString(); + } + + { QJsonValue qtInstallDirectory = jsonObject.value("qt"); if (qtInstallDirectory.isUndefined()) { fprintf(stderr, "No Qt directory in json file %s\n", qPrintable(options->inputFileName)); @@ -2086,8 +2094,14 @@ bool signPackage(const Options &options) #endif if (!QFile::exists(zipAlignTool)) { - fprintf(stderr, "zipalign tool not found: %s\n", qPrintable(zipAlignTool)); - return false; + zipAlignTool = options.sdkPath + QLatin1String("/build-tools/") + options.sdkBuildToolsVersion + QLatin1String("/zipalign"); +#if defined(Q_OS_WIN32) + zipAlignTool += QLatin1String(".exe"); +#endif + if (!QFile::exists(zipAlignTool)) { + fprintf(stderr, "zipalign tool not found: %s\n", qPrintable(zipAlignTool)); + return false; + } } zipAlignTool = QString::fromLatin1("%1%2 -f 4 %3 %4") |