From 9f25ceccfb1a6311cb6442df9308a76a34ca5725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 5 Sep 2023 10:03:29 +0200
Subject: [PATCH] .NET: Add support for Android builds

---
 build-android/build.sh |  6 ++----
 build-release.sh       | 18 +++++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/build-android/build.sh b/build-android/build.sh
index 5c8e181..ccb1b87 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -88,9 +88,7 @@ fi
 
 # Mono
 
-# No Android support with .NET 6 yet.
-#if [ "${MONO}" == "1" ]; then
-if false; then
+if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for Android..."
 
   cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
@@ -115,7 +113,7 @@ if false; then
   cp bin/android_source.zip /root/out/templates-mono/
   cp bin/android_debug.apk /root/out/templates-mono/
   cp bin/android_release.apk /root/out/templates-mono/
-  cp bin/godot-lib.release.aar /root/out/templates-mono/
+  cp bin/godot-lib.template_release.aar /root/out/templates-mono/
 fi
 
 echo "Android build successful"
diff --git a/build-release.sh b/build-release.sh
index 94d6054..76ed59d 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -490,6 +490,15 @@ if [ "${build_mono}" == "1" ]; then
   rm -rf macos_template.app
   sign_macos_template ${templatesdir_mono} 1
 
+  ## Android (Mono) ##
+
+  # Lib for direct download
+  cp out/android/templates-mono/godot-lib.template_release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.template_release.aar
+
+  # Templates
+  cp out/android/templates-mono/*.apk ${templatesdir_mono}/
+  cp out/android/templates-mono/android_source.zip ${templatesdir_mono}/
+
   # No .NET support for those platforms yet.
 
   if false; then
@@ -500,15 +509,6 @@ if [ "${build_mono}" == "1" ]; then
   cp out/web/templates-mono/godot.web.template_debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip
   cp out/web/templates-mono/godot.web.template_release.wasm32.mono.zip ${templatesdir_mono}/web_release.zip
 
-  ## Android (Mono) ##
-
-  # Lib for direct download
-  cp out/android/templates-mono/godot-lib.template_release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.template_release.aar
-
-  # Templates
-  cp out/android/templates-mono/*.apk ${templatesdir_mono}/
-  cp out/android/templates-mono/android_source.zip ${templatesdir_mono}/
-
   ## iOS (Mono) ##
 
   rm -rf ios_xcode