From ffbb129f183b49281bd6376f6982f52cb8f07a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kimmo=20Lepp=C3=A4l=C3=A4?= Date: Fri, 7 Mar 2014 10:23:06 +0200 Subject: [PATCH] Fix deployment to Android virtual device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Kimmo Leppälä --- src/plugins/android/androidconfigurations.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 69466cee13f..609e5e13e05 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -574,7 +574,9 @@ QVector 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