From 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 7 Jul 2020 21:16:19 +0200 Subject: Android: Enable configuring for a single abi architecture Fixes: QTBUG-80938 Pick-to: 5.15 Change-Id: Id87202e6b2520b18c6b06b71675157f588a28bd6 Reviewed-by: Alexandru Croitor --- mkspecs/features/android/resolve_config.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/android/resolve_config.prf') diff --git a/mkspecs/features/android/resolve_config.prf b/mkspecs/features/android/resolve_config.prf index 0cc4e73cc9..14749abcc0 100644 --- a/mkspecs/features/android/resolve_config.prf +++ b/mkspecs/features/android/resolve_config.prf @@ -1,6 +1,6 @@ load(resolve_config) -!equals(TEMPLATE, aux):!host_build:!single_arch:!java:android { +!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!singleAndroidAbi:android { isEmpty(ANDROID_ABIS): ANDROID_ABIS = $$ALL_ANDROID_ABIS ALL_ABIS = $$join(ANDROID_ABIS, _and_) -- cgit v1.2.3