mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android build: do not hard code armv7

Browse source 
Simple cleanup. Do not hard code armv7 as we have QT_ARCH. This
allows, in the future, for arm64 builds as well.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-11-24 10:15:11 +01:00 • committed by Dirk Hohndel
parent 6ea50fcfb7
commit e683eb4880
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packaging/android/build.sh
View file

@ -159,7 +159,8 @@ else
fi fi
# find qmake # find qmake
QMAKE=$QT5_ANDROID/android_armv7/bin/qmake QMAKE=$QT5_ANDROID/android_$QT_ARCH/bin/qmake
echo $QMAKE
$QMAKE -query $QMAKE -query
# if we are just doing a quick rebuild, don't bother with any of the dependencies # if we are just doing a quick rebuild, don't bother with any of the dependencies
@ -170,7 +171,7 @@ if [ "$QUICK" = "" ] ; then
# build google maps plugin # build google maps plugin
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps
# find qmake # find qmake
QMAKE=$QT5_ANDROID/android_armv7/bin/qmake QMAKE=$QT5_ANDROID/android_$QT_ARCH/bin/qmake
$QMAKE -query $QMAKE -query
QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS) QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so