From b133197258ec2b87e3f5c6291052e15a84392c26 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 16 Sep 2022 12:16:34 +0200 Subject: Docker/Android: Add Dockerfile for manual test Done-by: Alessandro, Cristian, Marcus Change-Id: I3806bb7386f5e7db28489f9f7e685648bfc20110 Reviewed-by: Marcus Tillmanns Reviewed-by: hjk --- .../Dockerfile-qt-6.3.2-android-ubuntu-22.04 | 52 ++++++++++++++++++++++ tests/manual/docker/android/Makefile | 5 +++ tests/manual/docker/android/README.md | 2 + tests/manual/docker/android/build.sh | 3 ++ tests/manual/docker/android/target_qt.conf | 10 +++++ 5 files changed, 72 insertions(+) create mode 100644 tests/manual/docker/android/Dockerfile-qt-6.3.2-android-ubuntu-22.04 create mode 100644 tests/manual/docker/android/Makefile create mode 100644 tests/manual/docker/android/README.md create mode 100755 tests/manual/docker/android/build.sh create mode 100644 tests/manual/docker/android/target_qt.conf (limited to 'tests/manual/docker') diff --git a/tests/manual/docker/android/Dockerfile-qt-6.3.2-android-ubuntu-22.04 b/tests/manual/docker/android/Dockerfile-qt-6.3.2-android-ubuntu-22.04 new file mode 100644 index 0000000000..bc9925b08c --- /dev/null +++ b/tests/manual/docker/android/Dockerfile-qt-6.3.2-android-ubuntu-22.04 @@ -0,0 +1,52 @@ +FROM ubuntu:22.04 + +ENV DEBIAN_FRONTEND noninteractive + +# Install dependencies +RUN apt-get update +RUN apt-get install -y \ + bash \ + curl \ + git \ + openjdk-11-jdk \ + unzip \ + wget \ + cmake \ + ninja-build \ + nano + +# Install Android SDK +ENV ANDROID_SDK_ROOT /opt/android-sdk +ENV ANDROID_HOME /opt/android-sdk +ENV ANDROID_SDK /opt/android-sdk +ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin + +RUN mkdir -p ${ANDROID_SDK_ROOT} && \ + cd ${ANDROID_SDK_ROOT} + +WORKDIR ${ANDROID_SDK_ROOT} + +RUN curl https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip -o commandlinetools.zip +RUN unzip -q commandlinetools.zip && mv cmdline-tools tools && mkdir cmdline-tools && mv tools cmdline-tools/latest +RUN yes | sdkmanager --licenses +RUN sdkmanager "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670" + +WORKDIR /Qt + +RUN curl -L https://download.qt.io/online/qtsdkrepository/linux_x64/android/qt6_632_x86_64/qt.qt6.632.android_x86_64/6.3.2-0-202209072001qtbase-Linux-RHEL_8_4-Clang-Android-Android_ANY-X86_64.7z -o 6.3.2-X86_64.7z +RUN cmake -E tar xf 6.3.2-X86_64.7z + +RUN curl -L https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632/qt.qt6.632.gcc_64/6.3.2-0-202209071847qtbase-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z -o 6.3.2-host.7z +RUN cmake -E tar xf 6.3.2-host.7z + +RUN curl -L https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632/qt.qt6.632.gcc_64/6.3.2-0-202209071847icu-linux-Rhel7.2-x64.7z -o icu.7z +RUN cmake -E tar xf icu.7z + +RUN mkdir -p /home/qt/work/ +RUN ln -s /Qt/6.3.2/gcc_64 /home/qt/work/install + +COPY target_qt.conf /Qt/6.3.2/android_x86_64/bin + +# REMEMBER TO UPDATE THE qt.toolchain.cmake FILE!! + + diff --git a/tests/manual/docker/android/Makefile b/tests/manual/docker/android/Makefile new file mode 100644 index 0000000000..e58ac57e95 --- /dev/null +++ b/tests/manual/docker/android/Makefile @@ -0,0 +1,5 @@ +qt-android-sdk-31: Dockerfile + docker build --platform linux/x86_64 . -t qt-android-sdk:31 -t qt-android-sdk + +qt-android-sdk-31-run: qt-android-sdk-31 + docker run --platform linux/x86_64 -it --rm qt-android-sdk:31 /bin/bash diff --git a/tests/manual/docker/android/README.md b/tests/manual/docker/android/README.md new file mode 100644 index 0000000000..8df2a61adf --- /dev/null +++ b/tests/manual/docker/android/README.md @@ -0,0 +1,2 @@ + +... diff --git a/tests/manual/docker/android/build.sh b/tests/manual/docker/android/build.sh new file mode 100755 index 0000000000..41d4ff1ece --- /dev/null +++ b/tests/manual/docker/android/build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker build -t qt-6.3.2-android-ubuntu-22.04-build -f Dockerfile-qt-6.3.2-android-ubuntu-22.04 . diff --git a/tests/manual/docker/android/target_qt.conf b/tests/manual/docker/android/target_qt.conf new file mode 100644 index 0000000000..c4fbb18edd --- /dev/null +++ b/tests/manual/docker/android/target_qt.conf @@ -0,0 +1,10 @@ +[DevicePaths] +Prefix=/Qt/6.3.2/android_x86_64 +[Paths] +Prefix=../ +HostPrefix=../../gcc_64 +HostData=../android_x86_64 +Sysroot= +SysrootifyPrefix=false +TargetSpec=android-clang +HostSpec=linux-g++ -- cgit v1.2.3