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

Fix deployment to Android virtual device

Browse Source 
With the latest Android SDK Tools installed deployment to Android
Virtual Device failed since the format of "android list avd"
changed to include device tag information.

Task-number: QTCREATORBUG-11658
Change-Id: I72a2427dedfaf0cd7638b9805c545fda0bd6598e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kimmo Leppälä <kimmo.leppala@digia.com>
This commit is contained in:
Kimmo Leppälä
2014-03-07 10:23:06 +02:00
committed by Daniel Teske
parent c3a23cb862
commit ffbb129f18
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,7 +574,9 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices() const
break;
if (line.contains(QLatin1String("Target:")))
dev.sdk = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).toInt();
if (line.contains(QLatin1String("ABI:")))
if (line.contains(QLatin1String("Tag/ABI:")))
dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char('/')) +1);
else if (line.contains(QLatin1String("ABI:")))
dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char(' '))).trimmed();
}
// armeabi-v7a devices can also run armeabi code