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

Android: Set ANDROID_NDK_PLATFORM based on the mimum sdk version

Browse Source 
And not based on the build sdk version.

Change-Id: I31a37652d40408e7bfc3f49366d97f560ee99c71
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
BogDan Vatra
2014-06-25 15:41:32 +02:00
committed by Daniel Teske
parent 384d5d7577
commit 8481c91fbf
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,11 +836,10 @@ SdkPlatform AndroidConfig::highestAndroidSdk() const
return m_availableSdkPlatforms.first(); return m_availableSdkPlatforms.first();
} }
QString AndroidConfig::bestNdkPlatformMatch(const QString &targetAPI) const QString AndroidConfig::bestNdkPlatformMatch(int target) const
{ {
updateNdkInformation();
int target = targetAPI.mid(targetAPI.lastIndexOf(QLatin1Char('-')) + 1).toInt();
target = std::max(9, target); target = std::max(9, target);
updateNdkInformation();
foreach (int apiLevel, m_availableNdkPlatforms) { foreach (int apiLevel, m_availableNdkPlatforms) {
if (apiLevel <= target) if (apiLevel <= target)
return QString::fromLatin1("android-%1").arg(apiLevel); return QString::fromLatin1("android-%1").arg(apiLevel);

2
src/plugins/android/androidconfigurations.h
View File

@@ -147,7 +147,7 @@ public:
bool startAVDAsync(const QString &avdName) const; bool startAVDAsync(const QString &avdName) const;
QString findAvd(int apiLevel, const QString &cpuAbi) const; QString findAvd(int apiLevel, const QString &cpuAbi) const;
QString waitForAvd(int apiLevel, const QString &cpuAbi, const QFutureInterface<bool> &fi = QFutureInterface<bool>()) const; QString waitForAvd(int apiLevel, const QString &cpuAbi, const QFutureInterface<bool> &fi = QFutureInterface<bool>()) const;
QString bestNdkPlatformMatch(const QString &targetAPI) const; QString bestNdkPlatformMatch(int target) const;
static ProjectExplorer::Abi::Architecture architectureForToolChainPrefix(const QString &toolchainprefix); static ProjectExplorer::Abi::Architecture architectureForToolChainPrefix(const QString &toolchainprefix);
static QLatin1String toolchainPrefix(ProjectExplorer::Abi::Architecture architecture); static QLatin1String toolchainPrefix(ProjectExplorer::Abi::Architecture architecture);

2
src/plugins/android/androidqtversion.cpp
View File

@@ -122,7 +122,7 @@ void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::En
return; return;
env.set(QLatin1String("ANDROID_NDK_PLATFORM"), env.set(QLatin1String("ANDROID_NDK_PLATFORM"),
AndroidConfigurations::currentConfig().bestNdkPlatformMatch(AndroidManager::buildTargetSDK(target))); AndroidConfigurations::currentConfig().bestNdkPlatformMatch(AndroidManager::minimumSDK(target)));
} }
Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const