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

Android: Change the minimum API level supported

Browse Source 
Change-Id: Iea6b1720c64810c490e4c9876ecb5ff8c8a9a935
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Vikas Pachdha
2018-06-18 13:17:49 +02:00
parent 9a4f0317c1
commit b10ada3aff
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -48,8 +48,6 @@
using namespace Android; using namespace Android;
using namespace Internal; using namespace Internal;
const int minApiSupported = 9;
AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
: ProjectExplorer::BuildStepConfigWidget(), : ProjectExplorer::BuildStepConfigWidget(),
m_ui(new Ui::AndroidBuildApkWidget), m_ui(new Ui::AndroidBuildApkWidget),
@@ -58,6 +56,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
m_ui->setupUi(this); m_ui->setupUi(this);
// Target sdk combobox // Target sdk combobox
const int minApiSupported = AndroidManager::apiLevelRange().first;
QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::sdkManager()-> QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::sdkManager()->
filteredSdkPlatforms(minApiSupported)); filteredSdkPlatforms(minApiSupported));
targets.removeDuplicates(); targets.removeDuplicates();

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

@@ -702,13 +702,13 @@ bool AndroidConfig::useNativeUiTools() const
QString AndroidConfig::bestNdkPlatformMatch(int target) const QString AndroidConfig::bestNdkPlatformMatch(int target) const
{ {
target = std::max(9, target); target = std::max(AndroidManager::apiLevelRange().first, target);
updateNdkInformation(); 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);
} }
return QLatin1String("android-9"); return QString("android-%1").arg(AndroidManager::apiLevelRange().first);
} }
FileName AndroidConfig::sdkLocation() const FileName AndroidConfig::sdkLocation() const

4
src/plugins/android/androidmanager.cpp
View File

@@ -258,7 +258,7 @@ void AndroidManager::setDeviceApiLevel(ProjectExplorer::Target *target, int leve
QPair<int, int> AndroidManager::apiLevelRange() QPair<int, int> AndroidManager::apiLevelRange()
{ {
return qMakePair(9, 26); return qMakePair(16, 27);
} }
QString AndroidManager::androidNameForApiLevel(int x) QString AndroidManager::androidNameForApiLevel(int x)
@@ -310,6 +310,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
return QLatin1String("Android 7.1"); return QLatin1String("Android 7.1");
case 26: case 26:
return QLatin1String("Android 8.0"); return QLatin1String("Android 8.0");
case 27:
return QLatin1String("Android 8.1");
default: default:
return tr("Unknown Android version. API Level: %1").arg(QString::number(x)); return tr("Unknown Android version. API Level: %1").arg(QString::number(x));
} }