diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-23 00:32:11 +0000 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-11-23 08:30:57 -0800 |
| commit | feb4ec2f6a1c22134214a08aa3ca2c6edff90271 (patch) | |
| tree | b8158ddd9daa56def08a78e4351cfed0dbc96525 /Subsurface-mobile.pro | |
| parent | 3e8bd6caa30c6bf64bf4a8c91cc762409f067a90 (diff) | |
| download | subsurface-feb4ec2f6a1c22134214a08aa3ca2c6edff90271.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'Subsurface-mobile.pro')
| -rw-r--r-- | Subsurface-mobile.pro | 9 |
1 files 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 \ |