From f8022accd203979c242442879bc65660a3b1828b Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 9 Jan 2022 21:46:47 +0100 Subject: [PATCH] Update the android dockerfile. --- tools/build-containers/Dockerfile.android | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build-containers/Dockerfile.android b/tools/build-containers/Dockerfile.android index 28806af9..5da394c9 100644 --- a/tools/build-containers/Dockerfile.android +++ b/tools/build-containers/Dockerfile.android @@ -6,13 +6,13 @@ ENV ANDROID_NDK_VERSION=21.4.7075529 ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION} RUN dnf -y install --setopt=install_weak_deps=False \ - gcc gcc-c++ java-1.8.0-openjdk-devel ncurses-compat-libs && \ + gcc gcc-c++ java-11-openjdk-devel ncurses-compat-libs && \ mkdir -p sdk && cd sdk && \ export CMDLINETOOLS=commandlinetools-linux-7302050_latest.zip && \ curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \ unzip ${CMDLINETOOLS} && \ rm ${CMDLINETOOLS} && \ yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \ - cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;30.0.3' 'platforms;android-29' 'cmake;3.18.1' + cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;30.0.3' 'platforms;android-30' 'cmake;3.18.1' CMD /bin/bash