Android: Update and pin NDK version, use android 29

This commit is contained in:
Rémi Verschelde
2020-10-09 13:19:06 +02:00
parent 795edeff5e
commit 7e119fda47

View File

@@ -7,14 +7,14 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
dnf -y install --setopt=install_weak_deps=False \
gcc gcc-c++ java-1.8.0-openjdk-devel ncurses-compat-libs && \
mkdir sdk && cd sdk && \
curl -LO https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
unzip sdk-tools-linux-4333796.zip && \
rm sdk-tools-linux-4333796.zip && \
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 ndk-bundle 'build-tools;28.0.3' 'platforms;android-28' 'cmake;3.10.2.4988404'
tools/bin/sdkmanager 'ndk;21.3.6528147' 'build-tools;29.0.3' 'platforms;android-29' 'cmake;3.10.2.4988404'
ENV ANDROID_HOME=/root/sdk/
ENV ANDROID_NDK_ROOT=/root/sdk/ndk-bundle/
ENV ANDROID_NDK_ROOT=/root/sdk/ndk/21.3.6528147/
RUN cp -a /root/files/${mono_version} /root && \
export MONO_SOURCE_ROOT=/root/${mono_version} && \