From 112e3f4cba3ab45f15c35b6c34983a809779ce24 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Fri, 18 Oct 2024 02:09:06 +0300
Subject: [PATCH] Android: place host abis first in AVD creation wizard

Avoids less switching and it's more practical.

Change-Id: Icdc48cee1d3c5a47e054136596732c584bb58a7c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/android/avddialog.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index 9fb67e951b7..650ce413d8e 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -29,6 +29,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QToolTip>
+#include <QSysInfo>
 
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -45,12 +46,24 @@ AvdDialog::AvdDialog(QWidget *parent)
     setWindowTitle(Tr::tr("Create new AVD"));
 
     m_abiComboBox = new QComboBox;
-    m_abiComboBox->addItems({
-        ProjectExplorer::Constants::ANDROID_ABI_X86,
-        ProjectExplorer::Constants::ANDROID_ABI_X86_64,
+    // Put the host architectures on top prioritizing 64 bit
+    const QStringList armAbis = {
+        ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
         ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A,
-        ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A
-    });
+    };
+
+    const QStringList x86Abis = {
+        ProjectExplorer::Constants::ANDROID_ABI_X86_64,
+        ProjectExplorer::Constants::ANDROID_ABI_X86
+    };
+
+    QStringList items;
+    if (QSysInfo::currentCpuArchitecture().startsWith("arm"))
+        items << armAbis << x86Abis;
+    else
+        items << x86Abis << armAbis;
+
+    m_abiComboBox->addItems(items);
 
     m_sdcardSizeSpinBox = new QSpinBox;
     m_sdcardSizeSpinBox->setSuffix(Tr::tr(" MiB"));