From 06420a2e06e55b5e5b9ea01d9c9f2aa45b276ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 8 Jul 2022 17:10:37 +0200 Subject: [PATCH] Android: Mono build now supports NDK r23, drops unused android cross compilers --- Dockerfile.android | 14 ++++---------- README.md | 2 +- build.sh | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile.android b/Dockerfile.android index 2eda388..ec80ce2 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -18,19 +18,13 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand 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;32.0.0' 'platforms;android-32' 'cmake;3.18.1' -# Mono still not compatible with NDK r22+: -# https://github.com/godotengine/godot-mono-builds/issues/68 -RUN export ANDROID_NDK_VERSION_MONO=21.4.7075529 && \ - export ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION_MONO} && \ - /root/sdk/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION_MONO}" && \ - cp -a /root/files/${mono_version} /root && \ +RUN cp -a /root/files/${mono_version} /root && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \ cd /root/${mono_version}/godot-mono-builds && \ - python3 android.py configure -j --target=all-runtime && \ - python3 android.py make -j --target=all-runtime && \ + python3 android.py configure -j --target=all-targets && \ + python3 android.py make -j --target=all-targets && \ python3 bcl.py make -j --product=android && \ cd /root && \ - rm -rf /root/${mono_version} && \ - rm -rf ${ANDROID_NDK_ROOT} + rm -rf /root/${mono_version} CMD /bin/bash diff --git a/README.md b/README.md index 79bf40f..056fcc1 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ These are the expected container image sizes, so you can plan your disk usage in localhost/godot-linux 3.x-f36-mono-6.12.0.182 3.8 GB localhost/godot-windows 3.x-f36-mono-6.12.0.182 3.31 GB localhost/godot-javascript 3.x-f36-mono-6.12.0.182 3.87 GB - localhost/godot-android 3.x-f36-mono-6.12.0.182 16.8 GB + localhost/godot-android 3.x-f36-mono-6.12.0.182 6.06 GB localhost/godot-osx 3.x-f36-mono-6.12.0.182 5.71 GB localhost/godot-ios 3.x-f36-mono-6.12.0.182 6.53 GB diff --git a/build.sh b/build.sh index a582000..a14b7c5 100755 --- a/build.sh +++ b/build.sh @@ -62,7 +62,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 fcf205c105bb2eb88dc85975887170c42675d245 + git checkout 4bf530983a52d09f4f63aea032aee9be47931cbd export MONO_SOURCE_ROOT=${mono_root} python3 patch_mono.py popd