From d628f007535b1599b66a11a2be46501065f39057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 22 Feb 2021 16:46:03 +0100 Subject: [PATCH] Android: Install NDK 21.4 and latest cmdline tools 3.2.4 RC 3+ require NDK 21.4. --- Dockerfile.android | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.android b/Dockerfile.android index 5b7e0cf..cdd1a93 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -4,18 +4,18 @@ FROM godot-mono:${img_version} ARG mono_version ENV ANDROID_SDK_ROOT=/root/sdk -ENV ANDROID_NDK_VERSION=21.3.6528147 +ENV ANDROID_NDK_VERSION=21.4.7075529 ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION} RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \ dnf -y install --setopt=install_weak_deps=False \ java-1.8.0-openjdk-devel ncurses-compat-libs && \ - mkdir -p sdk/cmdline-tools && cd sdk/cmdline-tools && \ - curl -LO https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip && \ - unzip commandlinetools-linux-6609375_latest.zip && \ - rm commandlinetools-linux-6609375_latest.zip && \ - yes | tools/bin/sdkmanager --licenses && \ - tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;30.0.1' 'platforms;android-30' 'cmake;3.10.2.4988404' + mkdir -p sdk && cd sdk && \ + curl -LO https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip && \ + unzip commandlinetools-linux-6858069_latest.zip && \ + rm commandlinetools-linux-6858069_latest.zip && \ + 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.1' 'platforms;android-29' 'cmake;3.10.2.4988404' RUN cp -a /root/files/${mono_version} /root && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \