From b10ada3aff3d15b8a5133c602302e3b44192a82b Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Mon, 18 Jun 2018 13:17:49 +0200 Subject: [PATCH] Android: Change the minimum API level supported Change-Id: Iea6b1720c64810c490e4c9876ecb5ff8c8a9a935 Reviewed-by: hjk --- src/plugins/android/androidbuildapkwidget.cpp | 3 +-- src/plugins/android/androidconfigurations.cpp | 4 ++-- src/plugins/android/androidmanager.cpp | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp index dceb496f5ec..6cfa0286509 100644 --- a/src/plugins/android/androidbuildapkwidget.cpp +++ b/src/plugins/android/androidbuildapkwidget.cpp @@ -48,8 +48,6 @@ using namespace Android; using namespace Internal; -const int minApiSupported = 9; - AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) : ProjectExplorer::BuildStepConfigWidget(), m_ui(new Ui::AndroidBuildApkWidget), @@ -58,6 +56,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) m_ui->setupUi(this); // Target sdk combobox + const int minApiSupported = AndroidManager::apiLevelRange().first; QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::sdkManager()-> filteredSdkPlatforms(minApiSupported)); targets.removeDuplicates(); diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index fbc99f29b4a..f49296a418d 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -702,13 +702,13 @@ bool AndroidConfig::useNativeUiTools() const QString AndroidConfig::bestNdkPlatformMatch(int target) const { - target = std::max(9, target); + target = std::max(AndroidManager::apiLevelRange().first, target); updateNdkInformation(); foreach (int apiLevel, m_availableNdkPlatforms) { if (apiLevel <= target) return QString::fromLatin1("android-%1").arg(apiLevel); } - return QLatin1String("android-9"); + return QString("android-%1").arg(AndroidManager::apiLevelRange().first); } FileName AndroidConfig::sdkLocation() const diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 61a87b2ddf3..74e35bdf2c4 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -258,7 +258,7 @@ void AndroidManager::setDeviceApiLevel(ProjectExplorer::Target *target, int leve QPair AndroidManager::apiLevelRange() { - return qMakePair(9, 26); + return qMakePair(16, 27); } QString AndroidManager::androidNameForApiLevel(int x) @@ -310,6 +310,8 @@ QString AndroidManager::androidNameForApiLevel(int x) return QLatin1String("Android 7.1"); case 26: return QLatin1String("Android 8.0"); + case 27: + return QLatin1String("Android 8.1"); default: return tr("Unknown Android version. API Level: %1").arg(QString::number(x)); }