From dea1ef84d50620d8030566d058c39d9d50f7c5df Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 23 Dec 2020 17:55:02 +0000 Subject: [PATCH] build-system/Android: adapt the Google maps plugin name This appears to be needed only for Android with Qt 5.15. Which means that this commit creates odd breakage in case someone were to try to build for Android with an older Qt version - but given that the current build process only works with Qt 5.14 or 5.15, I think this is an acceptable flaw. Signed-off-by: Dirk Hohndel --- Subsurface-mobile.pro | 2 +- packaging/android/qmake-build.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index d8a00757b..190270bec 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -331,7 +331,7 @@ android { ../install-root-$${QT_ARCH}/lib/libsqlite3.a \ ../install-root-$${QT_ARCH}/lib/libssl_1_1.so \ ../install-root-$${QT_ARCH}/lib/libcrypto_1_1.so \ - ../googlemaps-build/libqtgeoservices_googlemaps_$${QT_ARCH}.so + ../googlemaps-build/libplugins_geoservices_qtgeoservices_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 diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh index c209cce36..18f20a4ee 100755 --- a/packaging/android/qmake-build.sh +++ b/packaging/android/qmake-build.sh @@ -158,8 +158,13 @@ if [ "$QUICK" = "" ] ; then # build google maps plugin # this is the easy one as it uses qmake which ensures things get built for all platforms, etc "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps + # but unfortunately, on Android (and apparently only on Android) the naming pattern for geoservice + # plugins has changed + pushd googlemaps + sed -i 's/TARGET = qtgeoservices_googlemaps/TARGET = plugins_geoservices_qtgeoservices_googlemaps/' googlemaps.pro + popd QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS) - GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so + GOOGLEMAPS_BIN=libplugins_geoservices_qtgeoservices_googlemaps_arm64-v8a.so if [ ! -e "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] || [ googlemaps/.git/HEAD -nt "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] ; then mkdir -p googlemaps-build pushd googlemaps-build