summaryrefslogtreecommitdiffstats
path: root/packaging/android
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2019-09-27 20:30:31 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-04 09:16:30 -0700
commit43cd80dfc18474f13fc53ca00a828075e69dc3de (patch)
tree2b70dcc451d69af4081bc888b6ef2dfc91182106 /packaging/android
parentdbdfb9b517ca28dd4fefc95fffe387c6bbb2db56 (diff)
downloadsubsurface-43cd80dfc18474f13fc53ca00a828075e69dc3de.tar.gz
android-build: Add support for x86_64
This adds support for building x86_64 apks. Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'packaging/android')
-rwxr-xr-xpackaging/android/build.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index a92d28a51..31cd058fe 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -63,7 +63,7 @@ while [ "$#" -gt 0 ] ; do
SUBSURFACE_DESKTOP=ON
shift
;;
- arm|arm64|x86)
+ arm|arm64|x86|x86_64)
ARCH=$1
shift
;;
@@ -129,6 +129,11 @@ elif [ "$ARCH" = "x86" ] ; then
BUILDCHAIN=i686-linux-android
OPENSSL_MACHINE=i686
ANDROID_ABI=x86
+elif [ "$ARCH" = "x86_64" ] ; then
+ QT_ARCH=$ARCH
+ BUILDCHAIN=x86_64-linux-android
+ OPENSSL_MACHINE=$ARCH
+ ANDROID_ABI=$ARCH
fi
# Verify Qt install and adjust for single-arch Qt install layout