diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-18 22:01:29 +0000 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-11-19 17:18:33 -0800 |
| commit | cb4ccea3c225fa4d294f4861530ff3b67c1d9efd (patch) | |
| tree | 0eeb171fb50df0a442f6c540d841171112c347b8 /packaging | |
| parent | 3071ea06f010664af636fbb26edec53abbbe58de (diff) | |
| download | subsurface-cb4ccea3c225fa4d294f4861530ff3b67c1d9efd.tar.gz | |
build-system: update Android builder docker container
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>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/android/android-build-setup.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/android/android-build-setup.sh b/packaging/android/android-build-setup.sh index 88f2d99be..20aff7edd 100755 --- a/packaging/android/android-build-setup.sh +++ b/packaging/android/android-build-setup.sh @@ -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 |