From 64b5364cab5d1b13971c1a633d203dbae3e9b474 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 17 Jan 2023 18:31:46 +0100 Subject: [PATCH] Android: Factor out removal of ndk packages from list Will be used in additional places, soon. Change-Id: Iceff0d14175f0bc9132d697d82ac46049a84ec17 Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidconfigurations.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 6239a0d4bad..b1714944cfd 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -922,6 +922,12 @@ QStringList AndroidConfig::allEssentials() const return allPackages; } +static QStringList packagesWithoutNdks(const QStringList &packages) +{ + return Utils::filtered(packages, [] (const QString &p) { + return !p.startsWith(ndkPackageMarker()); }); +} + bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) { QStringList essentialPkgs(allEssentials()); @@ -933,8 +939,7 @@ bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) break; } if (!m_defaultNdk.isEmpty()) - essentialPkgs = Utils::filtered(essentialPkgs, [] (const QString &p) { - return !p.startsWith(ndkPackageMarker()); }); + essentialPkgs = packagesWithoutNdks(essentialPkgs); return essentialPkgs.isEmpty() ? true : false; }