From 19154bf0e75a52f8611843fd49729b79115b7bc7 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 2 Jun 2020 09:32:27 +0300 Subject: [PATCH] Android: shorten the kit and debugger names The multi-abi kit names are too long since they contain the full list of ABIs, this might cause build issues at least on windows host. Task-number: QTBUG-83875 Change-Id: I137fa9a177eb2143be1421129b9dbd12515a3da9 Reviewed-by: Ville Voutilainen Reviewed-by: Alessandro Portale --- src/plugins/android/androidconfigurations.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 63bc3d15554..f787b86eddd 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1258,6 +1258,16 @@ void AndroidConfigurations::removeUnusedDebuggers() } } +static bool containsAllAbis(const QStringList &abis) +{ + QStringList supportedAbis{"armeabi-v7a", "arm64-v8a", "x86", "x86_64"}; + for (const QString &abi : abis) + if (supportedAbis.contains(abi)) + supportedAbis.removeOne(abi); + + return supportedAbis.isEmpty(); +} + static QVariant findOrRegisterDebugger(ToolChain *tc, const QStringList &abisList, const BaseQtVersion *qtVersion) @@ -1289,8 +1299,8 @@ static QVariant findOrRegisterDebugger(ToolChain *tc, debugger.setEngineType(Debugger::GdbEngineType); debugger.setUnexpandedDisplayName( AndroidConfigurations::tr("Android Debugger (%1, NDK %2)") - .arg(abisList.join(", "), - AndroidConfigurations::currentConfig().ndkVersion(qtVersion).toString())); + .arg(containsAllAbis(abisList) ? "Multi-Abi" : abisList.join(",")) + .arg(AndroidConfigurations::currentConfig().ndkVersion(qtVersion).toString())); debugger.setAutoDetected(true); debugger.setAbis(abis.toVector()); debugger.reinitializeFromFile(); @@ -1390,9 +1400,9 @@ void AndroidConfigurations::updateAutomaticKitList() QStringList abis = static_cast(qt)->androidAbis(); Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis, QtKitAspect::qtVersion(k))); k->makeSticky(); - k->setUnexpandedDisplayName(tr("Android for %1 (Clang %2)") - .arg(abis.join(",")) - .arg(qt->displayName())); + k->setUnexpandedDisplayName(tr("Android Qt %1 Clang %2") + .arg(qt->qtVersionString()) + .arg(containsAllAbis(abis) ? "Multi-Abi" : abis.join(","))); k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString()); k->setValueSilently(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString()); };