public_mirrors
/
build-containers
mirror of https://github.com/godotengine/build-containers.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from godotengine/android-ndk-21.4 

Android: Install NDK 21.4 and latest cmdline tools
This commit is contained in:
Rémi Verschelde 2021-02-22 16:48:59 +01:00 committed by GitHub
parent aaa066f0cf d628f00753
commit d3a0c1f426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile.android
View File

@ -4,18 +4,18 @@ FROM godot-mono:${img_version}
ARG mono_version ARG mono_version
ENV ANDROID_SDK_ROOT=/root/sdk 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} 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 && \ 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 \ dnf -y install --setopt=install_weak_deps=False \
java-1.8.0-openjdk-devel ncurses-compat-libs && \ java-1.8.0-openjdk-devel ncurses-compat-libs && \
mkdir -p sdk/cmdline-tools && cd sdk/cmdline-tools && \ mkdir -p sdk && cd sdk && \
curl -LO https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip && \ curl -LO https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip && \
unzip commandlinetools-linux-6609375_latest.zip && \ unzip commandlinetools-linux-6858069_latest.zip && \
rm commandlinetools-linux-6609375_latest.zip && \ rm commandlinetools-linux-6858069_latest.zip && \
yes | tools/bin/sdkmanager --licenses && \ yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --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' 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 && \ RUN cp -a /root/files/${mono_version} /root && \
export MONO_SOURCE_ROOT=/root/${mono_version} && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \