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

Android: Enable manual adding of NDKs v22+

Browse Source 
Don't enforce the presence of a "platforms" subdirectory if the NDK is
of version 22 or higher. The last NDK version with that directory is 21.

Change-Id: Ib431e7db4521533206304d252dcf93b7ea6169e5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-11-01 17:19:43 +01:00
parent b6228eb182
commit 0de09fe3a3
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androidconfigurations.cpp
View File

@@ -840,11 +840,23 @@ QStringList AndroidConfig::getAbis(const QString &device)
bool AndroidConfig::isValidNdk(const QString &ndkLocation) const bool AndroidConfig::isValidNdk(const QString &ndkLocation) const
{ {
auto ndkPath = Utils::FilePath::fromUserInput(ndkLocation); auto ndkPath = Utils::FilePath::fromUserInput(ndkLocation);
const FilePath ndkPlatformsDir = ndkPath.pathAppended("platforms");
return ndkPath.exists() && ndkPath.pathAppended("toolchains").exists() if (!ndkPath.exists())
&& ndkPlatformsDir.exists() && !ndkPlatformsDir.toString().contains(' ') return false;
&& !ndkVersion(ndkPath).isNull();
if (!ndkPath.pathAppended("toolchains").exists())
return false;
const QVersionNumber version = ndkVersion(ndkPath);
if (ndkVersion(ndkPath).isNull())
return false;
const FilePath ndkPlatformsDir = ndkPath.pathAppended("platforms");
if (version.majorVersion() <= 22
&& (!ndkPlatformsDir.exists() || ndkPlatformsDir.toString().contains(' ')))
return false; // TODO: Adapt code that assumes the presence of a "platforms" folder
return true;
} }
QString AndroidConfig::bestNdkPlatformMatch(int target, const BaseQtVersion *qtVersion) const QString AndroidConfig::bestNdkPlatformMatch(int target, const BaseQtVersion *qtVersion) const