From 9c7b1d39d392d737b68144fd21c0fd991b89cd39 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 14 Jan 2022 16:42:21 +0100 Subject: [PATCH] Android: Fix compatibility check in AndroidDevice::canSupportAbis A typo prevented to check whether a non-armeabi device supports running armeabi applications. Change-Id: Ibfdf76f69c1bdf5f4dc1ba73147328a8f7f6ae3f Reviewed-by: Assam Boudjelthia --- src/plugins/android/androiddevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index a062299aab9..8f923146f5b 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -294,7 +294,7 @@ bool AndroidDevice::canSupportAbis(const QStringList &abis) const // arm64 usually can run {arm, armv7}, x86 can support {arm, armv7}, and 64-bit devices // can support their 32-bit variants. using namespace ProjectExplorer::Constants; - const bool isTheirsArm = abis.contains(ANDROID_ABI_ARMEABI_V7A) + const bool isTheirsArm = abis.contains(ANDROID_ABI_ARMEABI) || abis.contains(ANDROID_ABI_ARMEABI_V7A); // The primary ABI at the first index const bool oursSupportsArm = ourAbis.first() == ANDROID_ABI_ARM64_V8A