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

build-system: update Android builder docker container

Browse source 
This adjusts the docker setup to create a container with the correct
NDK, SDK, tools, Qt version, etc, and updates the helper scripts that
are needed in order to do that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-18 22:01:29 +00:00
parent 3071ea06f0
commit cb4ccea3c2
3 changed files with 58 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/android/android-build-setup.sh
View file

@ -13,7 +13,6 @@ if [ "$(uname)" != Linux ] ; then
fi
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
export SUBSURFACE_SOURCE="$SCRIPTDIR"/../..
# these are the current versions for Qt, Android SDK & NDK:
source "$SCRIPTDIR"/variables.sh
@ -45,13 +44,14 @@ fi
# first we need to get the Android SDK and NDK
export JAVA_HOME=/usr
export ANDROID_HOME=$(pwd)
export PATH=$ANDROID_HOME/cmdline-tools/bin:/usr/local/bin:/bin
export PATH=$ANDROID_HOME/cmdline-tools/bin:/usr/local/bin:/bin:/usr/bin
rm -rf cmdline-tools/latest
sdkmanager --sdk_root="$ANDROID_HOME" "ndk;$NDK_VERSION" "cmdline-tools;latest" "platform-tools" "platforms;$ANDROID_PLATFORMS" "build-tools;$ANDROID_BUILDTOOLS_REVISION"
echo "yyyyyyyy" | sdkmanager --sdk_root=/android --licenses
yes | sdkmanager --sdk_root="$ANDROID_HOME" "ndk;$NDK_VERSION" "cmdline-tools;latest" "platform-tools" "platforms;$ANDROID_PLATFORMS" "build-tools;$ANDROID_BUILDTOOLS_REVISION"
yes | sdkmanager --sdk_root=/android --licenses
# next check that Qt is installed
if [ ! -d "$LATEST_QT" ] ; then
pip3 install aqtinstall
aqt install -O /android "$LATEST_QT" linux android -m qtcharts
fi