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

Android: Support new android list target output

Browse Source 
Change-Id: I287c0b7acb32d391080a57792740b3316a87c64d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-04-10 15:52:02 +02:00
parent 75dd839469
commit 25e6d581d3
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,19 @@ namespace {
return dev1.serialNumber < dev2.serialNumber; return dev1.serialNumber < dev2.serialNumber;
} }
static QStringList cleanAndroidABIs(const QStringList &abis)
{
QStringList res;
foreach (const QString &abi, abis) {
int index = abi.lastIndexOf(QLatin1Char('/'));
if (index == -1)
res << abi;
else
res << abi.mid(index + 1);
}
return res;
}
} }
////////////////////////////////// //////////////////////////////////
@@ -295,8 +308,10 @@ void AndroidConfig::updateAvailableSdkPlatforms() const
platform.apiLevel = androidTarget.mid(androidTarget.lastIndexOf(QLatin1Char('-')) + 1).toInt(); platform.apiLevel = androidTarget.mid(androidTarget.lastIndexOf(QLatin1Char('-')) + 1).toInt();
} else if (line.startsWith(QLatin1String("Name:"))) { } else if (line.startsWith(QLatin1String("Name:"))) {
platform.name = line.mid(6); platform.name = line.mid(6);
} else if (line.startsWith(QLatin1String("Tag/ABIs :"))) {
platform.abis = cleanAndroidABIs(line.mid(10).trimmed().split(QLatin1String(", ")));
} else if (line.startsWith(QLatin1String("ABIs"))) { } else if (line.startsWith(QLatin1String("ABIs"))) {
platform.abis = line.mid(6).trimmed().split(QLatin1String(", ")); platform.abis = cleanAndroidABIs(line.mid(6).trimmed().split(QLatin1String(", ")));
} else if (line.startsWith(QLatin1String("---")) || line.startsWith(QLatin1String("==="))) { } else if (line.startsWith(QLatin1String("---")) || line.startsWith(QLatin1String("==="))) {
if (platform.apiLevel == -1) if (platform.apiLevel == -1)
continue; continue;