diff --git a/Dockerfile.android b/Dockerfile.android index d86b241..7a0f98a 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -3,6 +3,9 @@ FROM godot-mono:${img_version} ARG mono_version +ENV ANDROID_NDK_VERSION=21.3.6528147 +ENV ANDROID_SDK_ROOT=/root/sdk/ + 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 && \ @@ -11,9 +14,9 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand unzip commandlinetools-linux-6609375_latest.zip && \ rm commandlinetools-linux-6609375_latest.zip && \ yes | tools/bin/sdkmanager --licenses && \ - tools/bin/sdkmanager 'cmdline-tools;latest' 'build-tools;30.0.1' 'platforms;android-30' 'cmake;3.10.2.4988404' + 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' -ENV ANDROID_SDK_ROOT=/root/sdk/ +ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION} RUN cp -a /root/files/${mono_version} /root && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \