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

Android: Fix abi detection for 64bit devices

Browse Source 
Change-Id: Idde12cd5bcd54d007245d3bdd93e8ab47d7f214b
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-11-18 12:55:21 +01:00
parent cd8dc3ae12
commit 005f5116a5
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -840,6 +840,24 @@ bool AndroidConfig::hasFinishedBooting(const QString &device) const
QStringList AndroidConfig::getAbis(const QString &device) const QStringList AndroidConfig::getAbis(const QString &device) const
{ {
QStringList result; QStringList result;
// First try via ro.product.cpu.abilist
QStringList arguments = AndroidDeviceInfo::adbSelector(device);
arguments << QLatin1String("shell") << QLatin1String("getprop");
arguments << QLatin1String("ro.product.cpu.abilist");
QProcess adbProc;
adbProc.start(adbToolPath().toString(), arguments);
if (!adbProc.waitForFinished(10000)) {
adbProc.kill();
return result;
}
QString output = QString::fromLocal8Bit(adbProc.readAll().trimmed());
if (!output.isEmpty()) {
QStringList result = output.split(QLatin1Char(','));
if (!result.isEmpty())
return result;
}
// Fall back to ro.product.cpu.abi, ro.product.cpu.abi2 ...
for (int i = 1; i < 6; ++i) { for (int i = 1; i < 6; ++i) {
QStringList arguments = AndroidDeviceInfo::adbSelector(device); QStringList arguments = AndroidDeviceInfo::adbSelector(device);
arguments << QLatin1String("shell") << QLatin1String("getprop"); arguments << QLatin1String("shell") << QLatin1String("getprop");