From ce04fa345dbe52a022b592dde3ff49514c66b4c2 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Fri, 6 Dec 2019 14:26:17 +0200
Subject: Android: make sure we don't add _$${QT_ARCH} twice

Fixes: QTBUG-80582
Change-Id: I2b3790bb18754e146db611d61c48a3b7a532575c
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 mkspecs/features/android/android.prf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mkspecs/features/android')

diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf
index af004bbb25..8290286ec6 100644
--- a/mkspecs/features/android/android.prf
+++ b/mkspecs/features/android/android.prf
@@ -36,7 +36,8 @@ build_pass {
             }
         }
     } else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install {
-        !contains(TARGET, "_$${QT_ARCH}"): TARGET = $${TARGET}_$${QT_ARCH}
+        tmpvar = $$str_member(TARGET, -$$str_size(QT_ARCH), -1)
+        !equals(tmpvar, $${QT_ARCH}): TARGET = $${TARGET}_$${QT_ARCH}
         target.path = /libs/$$ANDROID_TARGET_ARCH/
         INSTALLS *= target
     }
-- 
cgit v1.2.3