From 4070c765015d8ba1a4eef5ccb31e689f13ace342 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Thu, 3 Dec 2020 13:40:08 -0800
Subject: build-system/Android: we need to collect the ABIs earlier

That's what happens if you develop a script like this sequentially.
We need to have the ABIs picked in order to build googlemaps, otherwise
this fails with the build container as that only includes the ARM
libraries and tools.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/android/qmake-build.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'packaging')

diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh
index fc2c2dfe8..c209cce36 100755
--- a/packaging/android/qmake-build.sh
+++ b/packaging/android/qmake-build.sh
@@ -133,6 +133,22 @@ if [ ! -f libdivecomputer/configure ] ; then
 fi
 popd
 
+# build default architectures, or the given one?
+if [ "$ARCHITECTURES" = "" ] ; then
+	ARCHITECTURES="armv7a aarch64"
+fi
+
+# it would of course be too easy to use these terms consistently, so let's not
+# no where do we support x86 style Android builds - there aren't any relevant devices
+for ARCH in $ARCHITECTURES ; do
+	if [ "$ARCH" = "armv7a" ] ; then
+		ANDROID_ABI="armeabi-v7a"
+	else
+		ANDROID_ABI="arm64-v8a"
+	fi
+	BUILD_ABIS="$BUILD_ABIS $ANDROID_ABI"
+done
+
 # if this isn't just a quick rebuild, pull kirigami, icons, etc, and finally build the Googlemaps plugin
 if [ "$QUICK" = "" ] ; then
 	pushd "$SUBSURFACE_SOURCE"
@@ -155,11 +171,6 @@ if [ "$QUICK" = "" ] ; then
 fi
 
 # autoconf based libraries are harder
-# build default architectures, or the given one?
-if [ "$ARCHITECTURES" = "" ] ; then
-	ARCHITECTURES="armv7a aarch64"
-fi
-
 for ARCH in $ARCHITECTURES ; do
 	echo "START building libraries for $ARCH"
 	echo "====================================="
@@ -176,7 +187,6 @@ for ARCH in $ARCHITECTURES ; do
 		OPENSSL_ARCH="arm64"
 		ANDROID_ABI="arm64-v8a"
 	fi
-	BUILD_ABIS="$BUILD_ABIS $ANDROID_ABI"
 
 	export TARGET=$ARCH-linux-android
 	export AR=$TOOLCHAIN/bin/$BINUTIL_ARCH-linux-android$EABI-ar
-- 
cgit v1.2.3-70-g09d2