mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: force inclusion of 32 & 64 bit openssl libraries

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-23 00:32:11 +00:00
parent 3e8bd6caa3
commit feb4ec2f6a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Subsurface-mobile.pro
View file

@ -329,9 +329,14 @@ android {
../googlemaps-build/libqtgeoservices_googlemaps_$${QT_ARCH}.so ../googlemaps-build/libqtgeoservices_googlemaps_$${QT_ARCH}.so
# ensure that the openssl libraries are bundled into the app # 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 += \ ANDROID_EXTRA_LIBS += \
../install-root-$${QT_ARCH}/lib/libcrypto_1_1.so \ ../install-root-arm64-v8a/lib/libcrypto_1_1.so \
../install-root-$${QT_ARCH}/lib/libssl_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/ \ INCLUDEPATH += ../install-root-$${QT_ARCH}/include/ \
../install-root/lib/libzip/include \ ../install-root/lib/libzip/include \