From ea0e447e0dec06a7063cbe435d7f8498d5a5fba7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 4 Oct 2019 09:13:05 -0700 Subject: builld-system: switch Android to Qt 5.13.1 This fixes the SSL issue with Android 5.x/Lollipop. Signed-off-by: Dirk Hohndel --- scripts/docker/android-build-container/Dockerfile | 2 +- scripts/docker/android-build-container/download.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 scripts/docker/android-build-container/download.sh (limited to 'scripts/docker/android-build-container') diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index 2b7107601..62363d559 100644 --- a/scripts/docker/android-build-container/Dockerfile +++ b/scripts/docker/android-build-container/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && \ # install, NDK and SDK there, plus the three files from the Subsurface # sources that we need to get the prep routines to run RUN mkdir -p /android -ADD qt-opensource-linux-x64-5.12.4.run /android/ +ADD qt-opensource-linux-x64-5.13.1.run /android/ ADD android-ndk-r*-linux-x86_64.zip /android/ ADD sdk-tools-linux-*.zip /android/ ADD android-build-wrapper.sh variables.sh qt-installer-noninteractive.qs /android/ diff --git a/scripts/docker/android-build-container/download.sh b/scripts/docker/android-build-container/download.sh new file mode 100755 index 000000000..fffaeb18f --- /dev/null +++ b/scripts/docker/android-build-container/download.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +wget https://download.qt.io/official_releases/qt/5.13/5.13.1/qt-opensource-linux-x64-5.13.1.run +wget https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip +wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip +wget https://ftp.osuosl.org/pub/blfs/conglomeration/cmake/cmake-3.13.2.tar.gz -- cgit v1.2.3-70-g09d2