From 068c7f5de1f4bec6d670268398989317e60b385b Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Thu, 19 Nov 2020 11:49:09 -0800
Subject: [PATCH] android: move the build of googleaps plugin
We want to build the googlemaps plugin once we know with architectures we are
building for. So let's do that right before we build Subsurface-mobile.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
packaging/android/qmake-build.sh | 39 ++++++++++++--------------------
1 file changed, 15 insertions(+), 24 deletions(-)
diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh
index 2db40b59b..402846f21 100755
--- a/packaging/android/qmake-build.sh
+++ b/packaging/android/qmake-build.sh
@@ -113,24 +113,6 @@ $QMAKE -query
# if we are just doing a quick rebuild, don't bother with any of the dependencies
-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
- QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
- GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.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
- $QMAKE ../googlemaps/googlemaps.pro
- make -j4
- # $QMAKE -install qinstall -exe $GOOGLEMAPS_BIN "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN
- make install
- popd
- fi
-fi
-
# autoconf based libraries are harder
export TOOLCHAIN="$ANDROID_NDK_ROOT"/toolchains/llvm/prebuilt/linux-x86_64
PATH=$TOOLCHAIN/bin:$PATH
@@ -326,16 +308,25 @@ for ARCH in $ARCHITECTURES ; do
echo "====================================="
done # ARCH
-#"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . qt-android-cmake
-# the Qt Android cmake addon runs androiddeployqt with '--verbose' which
-# is, err, rather verbose. Let's not do that.
-#sed -i -e 's/--verbose//' qt-android-cmake/AddQtAndroidApk.cmake
-
-# if this isn't just a quick rebuild, pull kirigami, icons, etc
+# if this isn't just a quick rebuild, pull kirigami, icons, etc, and finally build the Googlemaps plugin
if [ "$QUICK" = "" ] ; then
pushd "$SUBSURFACE_SOURCE"
bash ./scripts/mobilecomponents.sh
popd
+
+ # 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
+ QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
+ GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.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
+ $QMAKE ANDROID_ABIS="$BUILD_ABIS" ../googlemaps/googlemaps.pro
+ make -j4
+ make install
+ popd
+ fi
fi
# set up the final build