From feb4ec2f6a1c22134214a08aa3ca2c6edff90271 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 23 Nov 2020 00:32:11 +0000 Subject: [PATCH] android: force inclusion of 32 & 64 bit openssl libraries The reference via 1160{QT_ARCH} should work, but for some reason it doesn't. Making it explicit is technically wrong, but at least it appears to ensure that the shared objects are bundled correctly. Signed-off-by: Dirk Hohndel --- Subsurface-mobile.pro | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index b2f1730b9..fe8ee6ee4 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -329,9 +329,14 @@ android { ../googlemaps-build/libqtgeoservices_googlemaps_$${QT_ARCH}.so # ensure that the openssl libraries are bundled into the app + # for some reason doing so with dollar dollar { QT_ARCH } (like what works + # above for the link time case) doesn not work for the EXTRA_LIBS case. + # so stupidly do it explicitly ANDROID_EXTRA_LIBS += \ - ../install-root-$${QT_ARCH}/lib/libcrypto_1_1.so \ - ../install-root-$${QT_ARCH}/lib/libssl_1_1.so + ../install-root-arm64-v8a/lib/libcrypto_1_1.so \ + ../install-root-arm64-v8a/lib/libssl_1_1.so \ + ../install-root-armeabi-v7a/lib/libcrypto_1_1.so \ + ../install-root-armeabi-v7a/lib/libssl_1_1.so INCLUDEPATH += ../install-root-$${QT_ARCH}/include/ \ ../install-root/lib/libzip/include \