From 8481c91fbf2257b74c19e93174140fe530a0e019 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 25 Jun 2014 15:41:32 +0200 Subject: [PATCH] Android: Set ANDROID_NDK_PLATFORM based on the mimum sdk version And not based on the build sdk version. Change-Id: I31a37652d40408e7bfc3f49366d97f560ee99c71 Reviewed-by: BogDan Vatra --- src/plugins/android/androidconfigurations.cpp | 5 ++--- src/plugins/android/androidconfigurations.h | 2 +- src/plugins/android/androidqtversion.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f45b0548219..84416075f45 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -836,11 +836,10 @@ SdkPlatform AndroidConfig::highestAndroidSdk() const 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); + updateNdkInformation(); foreach (int apiLevel, m_availableNdkPlatforms) { if (apiLevel <= target) return QString::fromLatin1("android-%1").arg(apiLevel); diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 1bd49a095c6..98a14746695 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -147,7 +147,7 @@ public: bool startAVDAsync(const QString &avdName) const; QString findAvd(int apiLevel, const QString &cpuAbi) const; QString waitForAvd(int apiLevel, const QString &cpuAbi, const QFutureInterface &fi = QFutureInterface()) const; - QString bestNdkPlatformMatch(const QString &targetAPI) const; + QString bestNdkPlatformMatch(int target) const; static ProjectExplorer::Abi::Architecture architectureForToolChainPrefix(const QString &toolchainprefix); static QLatin1String toolchainPrefix(ProjectExplorer::Abi::Architecture architecture); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 2929d93a3c6..559dd28f13e 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -122,7 +122,7 @@ void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::En return; env.set(QLatin1String("ANDROID_NDK_PLATFORM"), - AndroidConfigurations::currentConfig().bestNdkPlatformMatch(AndroidManager::buildTargetSDK(target))); + AndroidConfigurations::currentConfig().bestNdkPlatformMatch(AndroidManager::minimumSDK(target))); } Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const