From 6636cb9d01c224cbabba7937084ed3f8b3f2dc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 17 Aug 2021 08:56:14 +0200 Subject: [PATCH] Android: Install platform 30, sync updated godot-mono-builds --- Dockerfile.android | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.android b/Dockerfile.android index 4526afc..1bac838 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -16,7 +16,7 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand 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' RUN cp -a /root/files/${mono_version} /root && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \ diff --git a/build.sh b/build.sh index 2ec78a5..fa9f8de 100755 --- a/build.sh +++ b/build.sh @@ -97,7 +97,7 @@ if [ ! -e ${mono_root} ]; then # Set up godot-mono-builds in tree git clone --progress https://github.com/godotengine/godot-mono-builds pushd godot-mono-builds - git checkout c6bdc0fecafa0639372df481664da08ca8bd869d + git checkout 0d72e71a50f2b76f10cd348a3bbb6ed81209b5e4 export MONO_SOURCE_ROOT=${mono_root} python3 patch_mono.py popd