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

Android: Rework sdkTargets() to cache the output of adb

Browse Source 
Also rename/change highestAvailablePlatform to highestAvailableSdk.
This fixes a bug reported on irc, where the lists for sdk and ndk
were different and the highestAvailablePlatform was not available
as in the sdk.

Change-Id: I17fec9e8ce1913e933ddcf8eaa21d6bb6e14c5be
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-10-17 13:23:08 +02:00
parent 723d4a973f
commit 1df66a18d1
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,6 +224,7 @@ void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
save();
updateAvailableNdkPlatforms();
updateAvailableSdkPlatforms();
updateAutomaticKitList();
updateAndroidDevice();
emit updated();
@@ -241,25 +242,38 @@ void AndroidConfigurations::updateAvailableNdkPlatforms()
qSort(m_availableNdkPlatforms.begin(), m_availableNdkPlatforms.end(), qGreater<int>());
}
QStringList AndroidConfigurations::sdkTargets(int minApiLevel) const
void AndroidConfigurations::updateAvailableSdkPlatforms()
{
QStringList targets;
m_availableSdkPlatforms.clear();
QProcess proc;
proc.start(androidToolPath().toString(), QStringList() << QLatin1String("list") << QLatin1String("target")); // list avaialbe AVDs
if (!proc.waitForFinished(-1)) {
proc.terminate();
return targets;
return;
}
while (proc.canReadLine()) {
const QString line = QString::fromLocal8Bit(proc.readLine().trimmed());
int index = line.indexOf(QLatin1String("\"android-"));
if (index == -1)
continue;
QString apiLevel = line.mid(index + 1, line.length() - index - 2);
if (apiLevel.mid(apiLevel.lastIndexOf(QLatin1Char('-')) + 1).toInt() >= minApiLevel)
targets.push_back(apiLevel);
QString androidTarget = line.mid(index + 1, line.length() - index - 2);
int apiLevel = androidTarget.mid(androidTarget.lastIndexOf(QLatin1Char('-')) + 1).toInt();
QVector<int>::iterator it = qLowerBound(m_availableSdkPlatforms.begin(), m_availableSdkPlatforms.end(), apiLevel, qGreater<int>());
m_availableSdkPlatforms.insert(it, apiLevel);
}
return targets;
}
QStringList AndroidConfigurations::sdkTargets(int minApiLevel) const
{
QStringList result;
for (int i = 0; i < m_availableSdkPlatforms.size(); ++i) {
if (m_availableSdkPlatforms.at(i) >= minApiLevel)
result << QLatin1String("android-") + QString::number(m_availableSdkPlatforms.at(i));
else
break;
}
return result;
}
FileName AndroidConfigurations::adbToolPath() const
@@ -470,6 +484,8 @@ QString AndroidConfigurations::createAVD(int minApiLevel, QString targetArch) co
QDialog d;
Ui::AddNewAVDDialog avdDialog;
avdDialog.setupUi(&d);
// NOTE: adb list targets does actually include information on which abis are supported per apilevel
// we aren't using that information here
avdDialog.targetComboBox->addItems(sdkTargets(minApiLevel));
if (targetArch.isEmpty())
@@ -735,11 +751,11 @@ QStringList AndroidConfigurations::getAbis(const QString &device) const
return result;
}
QString AndroidConfigurations::highestAvailableAndroidPlatform() const
QString AndroidConfigurations::highestAndroidSdk() const
{
if (m_availableNdkPlatforms.isEmpty())
if (m_availableSdkPlatforms.isEmpty())
return QString();
return QLatin1String("android-") + QString::number(m_availableNdkPlatforms.first());
return QLatin1String("android-") + QString::number(m_availableSdkPlatforms.first());
}
QString AndroidConfigurations::bestNdkPlatformMatch(const QString &targetAPI) const
@@ -902,6 +918,7 @@ AndroidConfigurations::AndroidConfigurations(QObject *parent)
{
load();
updateAvailableNdkPlatforms();
updateAvailableSdkPlatforms();
connect(ProjectExplorer::SessionManager::instance(), SIGNAL(projectRemoved(ProjectExplorer::Project*)),
this, SLOT(clearDefaultDevices(ProjectExplorer::Project*)));