diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-11-24 10:15:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-30 11:20:34 -0800 |
| commit | e683eb4880309b35328614e724f7b4fd156b0e81 (patch) | |
| tree | 4dd371bcbfa2429318d02fdbdd408009595f045b /packaging | |
| parent | 6ea50fcfb776ef88ad452778a1e30105334dfb72 (diff) | |
| download | subsurface-e683eb4880309b35328614e724f7b4fd156b0e81.tar.gz | |
Android build: do not hard code armv7
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>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/android/build.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 1e1af3cd4..9a41a041f 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -159,7 +159,8 @@ else fi # find qmake -QMAKE=$QT5_ANDROID/android_armv7/bin/qmake +QMAKE=$QT5_ANDROID/android_$QT_ARCH/bin/qmake +echo $QMAKE $QMAKE -query # 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 "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps # find qmake - QMAKE=$QT5_ANDROID/android_armv7/bin/qmake + QMAKE=$QT5_ANDROID/android_$QT_ARCH/bin/qmake $QMAKE -query QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS) GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so |