From c43fdc64732fe3b933b15fd1922ee257eef112b6 Mon Sep 17 00:00:00 2001
From: devloglogan <devloglogan@gmail.com>
Date: Tue, 3 Sep 2024 08:38:42 -0500
Subject: [PATCH 1/3] Disable some editor settings by default in the XR Editor

---
 editor/editor_settings.cpp                            | 11 +++++++----
 .../java/org/godotengine/editor/BaseGodotEditor.kt    |  8 ++++++++
 .../java/lib/src/org/godotengine/godot/Godot.kt       |  4 ++++
 .../lib/src/org/godotengine/godot/GodotFragment.java  |  8 ++++++++
 .../java/lib/src/org/godotengine/godot/GodotHost.java |  9 +++++++++
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index efb42288a57d..f96c9c5a8e15 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -524,15 +524,18 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 
 	// Touchscreen
 	bool has_touchscreen_ui = DisplayServer::get_singleton()->is_touchscreen_available();
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/increase_scrollbar_touch_area", has_touchscreen_ui, "")
-	set_restart_if_changed("interface/touchscreen/increase_scrollbar_touch_area", true);
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_long_press_as_right_click", has_touchscreen_ui, "")
-	set_restart_if_changed("interface/touchscreen/enable_long_press_as_right_click", true);
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_pan_and_scale_gestures", has_touchscreen_ui, "")
 	set_restart_if_changed("interface/touchscreen/enable_pan_and_scale_gestures", true);
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/touchscreen/scale_gizmo_handles", has_touchscreen_ui ? 3 : 1, "1,5,1")
 	set_restart_if_changed("interface/touchscreen/scale_gizmo_handles", true);
 
+	// Disable some touchscreen settings by default for the XR Editor.
+	bool is_native_touchscreen = has_touchscreen_ui && !OS::get_singleton()->has_feature("xr_editor");
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_long_press_as_right_click", is_native_touchscreen, "")
+	set_restart_if_changed("interface/touchscreen/enable_long_press_as_right_click", true);
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/increase_scrollbar_touch_area", is_native_touchscreen, "")
+	set_restart_if_changed("interface/touchscreen/increase_scrollbar_touch_area", true);
+
 	// Scene tabs
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/scene_tabs/display_close_button", 1, "Never,If Tab Active,Always"); // TabBar::CloseButtonDisplayPolicy
 	_initial_set("interface/scene_tabs/show_thumbnail_on_hover", true);
diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
index 6b32c05233f2..08dc90d41ae3 100644
--- a/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
+++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
@@ -510,4 +510,12 @@ abstract class BaseGodotEditor : GodotActivity() {
 		val godot = godot ?: return Error.ERR_UNCONFIGURED
 		return verifyApk(godot.fileAccessHandler, apkPath)
 	}
+
+	override fun supportsFeature(featureTag: String): Boolean {
+		if (featureTag == "xr_editor") {
+			return isNativeXRDevice();
+		}
+
+        return false
+    }
 }
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
index 4e0ee85773df..4b88a42fd122 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
@@ -1004,6 +1004,10 @@ class Godot(private val context: Context) {
 	 */
 	@Keep
 	private fun hasFeature(feature: String): Boolean {
+		if (primaryHost?.supportsFeature(feature) ?: false) {
+			return true;
+		}
+
 		for (plugin in pluginRegistry.allPlugins) {
 			if (plugin.supportsFeature(feature)) {
 				return true
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
index 7721b13a64e4..ccea1f5f16e5 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
@@ -501,4 +501,12 @@ public Error verifyApk(@NonNull String apkPath) {
 		}
 		return Error.ERR_UNAVAILABLE;
 	}
+
+	@Override
+	public boolean supportsFeature(String featureTag) {
+		if (parentHost != null) {
+			return parentHost.supportsFeature(featureTag);
+		}
+		return false;
+	}
 }
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java
index 7ebe69aa19ef..2d04512ad57d 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java
@@ -136,4 +136,13 @@ default Error signApk(@NonNull String inputPath, @NonNull String outputPath, @No
 	default Error verifyApk(@NonNull String apkPath) {
 		return Error.ERR_UNAVAILABLE;
 	}
+
+	/**
+	 * Returns whether the given feature tag is supported.
+	 *
+	 * @see <a href="https://docs.godotengine.org/en/stable/tutorials/export/feature_tags.html">Feature tags</a>
+	 */
+	default boolean supportsFeature(String featureTag) {
+		return false;
+	}
 }

From 58fae43f1d4200f5a7bd8e8fde8ee7ba0dee0493 Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuya@meta.com>
Date: Fri, 13 Sep 2024 08:53:29 -0700
Subject: [PATCH 2/3] Update the Android editor flavors to avoid
 vendor-specific references

---
 .github/workflows/android_builds.yml          |   2 +-
 platform/android/java/build.gradle            |  38 +++++++++---------
 platform/android/java/editor/build.gradle     |  12 +++---
 .../org/godotengine/editor/GodotEditor.kt     |   0
 .../{meta => horizonos}/AndroidManifest.xml   |   0
 .../{meta => horizonos}/assets/vr_splash.png  | Bin
 .../org/godotengine/editor/GodotEditor.kt     |   2 +-
 .../org/godotengine/editor/GodotXRGame.kt     |   0
 .../org/godotengine/editor/BaseGodotEditor.kt |   4 ++
 .../godotengine/godot/utils/DeviceUtils.kt    |   2 +-
 10 files changed, 32 insertions(+), 28 deletions(-)
 rename platform/android/java/editor/src/{google => android}/java/org/godotengine/editor/GodotEditor.kt (100%)
 rename platform/android/java/editor/src/{meta => horizonos}/AndroidManifest.xml (100%)
 rename platform/android/java/editor/src/{meta => horizonos}/assets/vr_splash.png (100%)
 rename platform/android/java/editor/src/{meta => horizonos}/java/org/godotengine/editor/GodotEditor.kt (99%)
 rename platform/android/java/editor/src/{meta => horizonos}/java/org/godotengine/editor/GodotXRGame.kt (100%)

diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 00b211d2ece2..0e7dbf8e2be1 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -85,7 +85,7 @@ jobs:
         run: |
           cd platform/android/java
           ./gradlew generateGodotEditor
-          ./gradlew generateGodotMetaEditor
+          ./gradlew generateGodotHorizonOSEditor
           cd ../../..
           ls -l bin/android_editor_builds/
 
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index b63fa7f20af9..f938660259e8 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -25,7 +25,7 @@ allprojects {
 ext {
     supportedAbis = ["arm32", "arm64", "x86_32", "x86_64"]
     supportedFlavors = ["editor", "template"]
-    supportedEditorVendors = ["google", "meta"]
+    supportedAndroidDistributions = ["android", "horizonos"]
     supportedFlavorsBuildTypes = [
         "editor": ["dev", "debug", "release"],
         "template": ["dev", "debug", "release"]
@@ -94,17 +94,17 @@ def templateExcludedBuildTask() {
 /**
  * Generates the build tasks for the given flavor
  * @param flavor Must be one of the supported flavors ('template' / 'editor')
- * @param editorVendor Must be one of the supported editor vendors ('google' / 'meta')
+ * @param androidDistro Must be one of the supported Android distributions ('android' / 'horizonos')
  */
-def generateBuildTasks(String flavor = "template", String editorVendor = "google") {
+def generateBuildTasks(String flavor = "template", String androidDistro = "android") {
     if (!supportedFlavors.contains(flavor)) {
         throw new GradleException("Invalid build flavor: $flavor")
     }
-    if (!supportedEditorVendors.contains(editorVendor)) {
-        throw new GradleException("Invalid editor vendor: $editorVendor")
+    if (!supportedAndroidDistributions.contains(androidDistro)) {
+        throw new GradleException("Invalid Android distribution: $androidDistro")
     }
 
-    String capitalizedEditorVendor = editorVendor.capitalize()
+    String capitalizedAndroidDistro = androidDistro.capitalize()
     def buildTasks = []
 
     // Only build the binary files for which we have native shared libraries unless we intend
@@ -170,28 +170,28 @@ def generateBuildTasks(String flavor = "template", String editorVendor = "google
                 }
             } else {
                 // Copy the generated editor apk to the bin directory.
-                String copyEditorApkTaskName = "copyEditor${capitalizedEditorVendor}${capitalizedTarget}ApkToBin"
+                String copyEditorApkTaskName = "copyEditor${capitalizedAndroidDistro}${capitalizedTarget}ApkToBin"
                 if (tasks.findByName(copyEditorApkTaskName) != null) {
                     buildTasks += tasks.getByName(copyEditorApkTaskName)
                 } else {
                     buildTasks += tasks.create(name: copyEditorApkTaskName, type: Copy) {
-                        dependsOn ":editor:assemble${capitalizedEditorVendor}${capitalizedTarget}"
-                        from("editor/build/outputs/apk/${editorVendor}/${target}")
+                        dependsOn ":editor:assemble${capitalizedAndroidDistro}${capitalizedTarget}"
+                        from("editor/build/outputs/apk/${androidDistro}/${target}")
                         into(androidEditorBuildsDir)
-                        include("android_editor-${editorVendor}-${target}*.apk")
+                        include("android_editor-${androidDistro}-${target}*.apk")
                     }
                 }
 
                 // Copy the generated editor aab to the bin directory.
-                String copyEditorAabTaskName = "copyEditor${capitalizedEditorVendor}${capitalizedTarget}AabToBin"
+                String copyEditorAabTaskName = "copyEditor${capitalizedAndroidDistro}${capitalizedTarget}AabToBin"
                 if (tasks.findByName(copyEditorAabTaskName) != null) {
                     buildTasks += tasks.getByName(copyEditorAabTaskName)
                 } else {
                     buildTasks += tasks.create(name: copyEditorAabTaskName, type: Copy) {
-                        dependsOn ":editor:bundle${capitalizedEditorVendor}${capitalizedTarget}"
-                        from("editor/build/outputs/bundle/${editorVendor}${capitalizedTarget}")
+                        dependsOn ":editor:bundle${capitalizedAndroidDistro}${capitalizedTarget}"
+                        from("editor/build/outputs/bundle/${androidDistro}${capitalizedTarget}")
                         into(androidEditorBuildsDir)
-                        include("android_editor-${editorVendor}-${target}*.aab")
+                        include("android_editor-${androidDistro}-${target}*.aab")
                     }
                 }
             }
@@ -204,7 +204,7 @@ def generateBuildTasks(String flavor = "template", String editorVendor = "google
 }
 
 /**
- * Generate the Godot Editor Android binaries.
+ * Generate the Godot Editor binaries for Android devices.
  *
  * Note: Unless the 'generateNativeLibs` argument is specified, the Godot 'tools' shared libraries
  * must have been generated (via scons) prior to running this gradle task.
@@ -212,19 +212,19 @@ def generateBuildTasks(String flavor = "template", String editorVendor = "google
  */
 task generateGodotEditor {
     gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
-    dependsOn = generateBuildTasks("editor", "google")
+    dependsOn = generateBuildTasks("editor", "android")
 }
 
 /**
- * Generate the Godot Editor Android binaries for Meta devices.
+ * Generate the Godot Editor binaries for HorizonOS devices.
  *
  * Note: Unless the 'generateNativeLibs` argument is specified, the Godot 'tools' shared libraries
  * must have been generated (via scons) prior to running this gradle task.
  * The task will only build the binaries for which the shared libraries is available.
  */
-task generateGodotMetaEditor {
+task generateGodotHorizonOSEditor {
     gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
-    dependsOn = generateBuildTasks("editor", "meta")
+    dependsOn = generateBuildTasks("editor", "horizonos")
 }
 
 /**
diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle
index 74feb4fbdbbd..7e53106b339d 100644
--- a/platform/android/java/editor/build.gradle
+++ b/platform/android/java/editor/build.gradle
@@ -145,14 +145,14 @@ android {
         }
     }
 
-    flavorDimensions = ["vendor"]
+    flavorDimensions = ["android_distribution"]
     productFlavors {
-        google {
-            dimension "vendor"
+        android {
+            dimension "android_distribution"
             missingDimensionStrategy 'products', 'editor'
         }
-        meta {
-            dimension "vendor"
+        horizonos {
+            dimension "android_distribution"
             missingDimensionStrategy 'products', 'editor'
             ndk {
                 //noinspection ChromeOsAbiSupport
@@ -176,5 +176,5 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk15to18:1.77"
 
     // Meta dependencies
-    metaImplementation "org.godotengine:godot-openxr-vendors-meta:3.0.0-stable"
+    horizonosImplementation "org.godotengine:godot-openxr-vendors-meta:3.0.0-stable"
 }
diff --git a/platform/android/java/editor/src/google/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/android/java/org/godotengine/editor/GodotEditor.kt
similarity index 100%
rename from platform/android/java/editor/src/google/java/org/godotengine/editor/GodotEditor.kt
rename to platform/android/java/editor/src/android/java/org/godotengine/editor/GodotEditor.kt
diff --git a/platform/android/java/editor/src/meta/AndroidManifest.xml b/platform/android/java/editor/src/horizonos/AndroidManifest.xml
similarity index 100%
rename from platform/android/java/editor/src/meta/AndroidManifest.xml
rename to platform/android/java/editor/src/horizonos/AndroidManifest.xml
diff --git a/platform/android/java/editor/src/meta/assets/vr_splash.png b/platform/android/java/editor/src/horizonos/assets/vr_splash.png
similarity index 100%
rename from platform/android/java/editor/src/meta/assets/vr_splash.png
rename to platform/android/java/editor/src/horizonos/assets/vr_splash.png
diff --git a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt
similarity index 99%
rename from platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotEditor.kt
rename to platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt
index 1c05820f0f20..c8b81c4557ac 100644
--- a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotEditor.kt
+++ b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt
@@ -36,7 +36,7 @@ import app.blazium.godot.utils.isNativeXRDevice
 /**
  * Primary window of the Godot Editor.
  *
- * This is the implementation of the editor used when running on Meta devices.
+ * This is the implementation of the editor used when running on HorizonOS devices.
  */
 open class GodotEditor : BaseGodotEditor() {
 
diff --git a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotXRGame.kt b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt
similarity index 100%
rename from platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotXRGame.kt
rename to platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt
diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
index 08dc90d41ae3..a468c32c90fa 100644
--- a/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
+++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
@@ -516,6 +516,10 @@ abstract class BaseGodotEditor : GodotActivity() {
 			return isNativeXRDevice();
 		}
 
+		if (featureTag == "horizonos") {
+			return isHorizonOSDevice()
+		}
+
         return false
     }
 }
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt
index 112db75914e4..a830277724ce 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt
@@ -38,7 +38,7 @@ package app.blazium.godot.utils
 import android.os.Build
 
 /**
- * Returns true if running on Meta's Horizon OS.
+ * Returns true if running on Meta Horizon OS.
  */
 fun isHorizonOSDevice(): Boolean {
 	return "Oculus".equals(Build.BRAND, true)

From 62bf016bb1d54317dcd507925210606c4ec13df9 Mon Sep 17 00:00:00 2001
From: Raul Santos <raulsntos@gmail.com>
Date: Fri, 9 Feb 2024 17:26:53 +0100
Subject: [PATCH 3/3] C#: Fallback to CoreCLR/MonoVM hosting APIs when
 hostfxr/NativeAOT fails

Some platforms don't support hostfxr but we can use the coreclr/monosgen library directly to initialize the runtime.

Android exports now use the `android` runtime identifier instead of `linux-bionic`, this removes the restrictions we previously had:
- Adds support for all Android architectures (arm32, arm64, x32, and x64), previously only the 64-bit architectures were supported.
- Loads `System.Security.Cryptography.Native.Android` (the .NET library that binds to the Android OS crypto functions).
---
 editor/export/editor_export_plugin.cpp        |   4 +
 editor/export/editor_export_plugin.h          |   1 +
 .../Godot.NET.Sdk/Godot.NET.Sdk.csproj        |   1 +
 .../Godot.NET.Sdk/Sdk/Android.props           |   5 +
 .../Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props |   1 +
 .../GodotTools/Export/ExportPlugin.cs         |  25 ++-
 modules/mono/mono_gd/gd_mono.cpp              | 176 ++++++++++++++++--
 modules/mono/mono_gd/gd_mono.h                |   2 +-
 ...m.Security.Cryptography.Native.Android.jar | Bin 0 -> 8552 bytes
 platform/android/export/export_plugin.cpp     |  24 +--
 platform/android/java/app/build.gradle        |  40 +++-
 platform/android/java/app/config.gradle       |   8 +
 .../java/app/src/com/godot/game/GodotApp.java |  15 ++
 platform/android/java/build.gradle            |  40 +++-
 14 files changed, 301 insertions(+), 41 deletions(-)
 create mode 100644 modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Android.props
 create mode 100755 modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar

diff --git a/editor/export/editor_export_plugin.cpp b/editor/export/editor_export_plugin.cpp
index 28d0750d5a98..1c5aebbf3a90 100644
--- a/editor/export/editor_export_plugin.cpp
+++ b/editor/export/editor_export_plugin.cpp
@@ -221,6 +221,10 @@ bool EditorExportPlugin::supports_platform(const Ref<EditorExportPlatform> &p_ex
 	return ret;
 }
 
+PackedStringArray EditorExportPlugin::get_export_features(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const {
+	return _get_export_features(p_export_platform, p_debug);
+}
+
 PackedStringArray EditorExportPlugin::get_android_dependencies(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const {
 	PackedStringArray ret;
 	GDVIRTUAL_CALL(_get_android_dependencies, p_export_platform, p_debug, ret);
diff --git a/editor/export/editor_export_plugin.h b/editor/export/editor_export_plugin.h
index 56eea8501092..3b6e11382549 100644
--- a/editor/export/editor_export_plugin.h
+++ b/editor/export/editor_export_plugin.h
@@ -165,6 +165,7 @@ class EditorExportPlugin : public RefCounted {
 	virtual String get_name() const;
 
 	virtual bool supports_platform(const Ref<EditorExportPlatform> &p_export_platform) const;
+	PackedStringArray get_export_features(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 
 	virtual PackedStringArray get_android_dependencies(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 	virtual PackedStringArray get_android_dependencies_maven_repos(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
index cad76d068902..ed2871cef526 100644
--- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
@@ -30,6 +30,7 @@
     <None Include="$(GodotSdkPackageVersionsFilePath)" Pack="true" PackagePath="Sdk">
       <Link>Sdk\SdkPackageVersions.props</Link>
     </None>
+    <None Include="Sdk\Android.props" Pack="true" PackagePath="Sdk" />
     <None Include="Sdk\iOSNativeAOT.props" Pack="true" PackagePath="Sdk" />
     <None Include="Sdk\iOSNativeAOT.targets" Pack="true" PackagePath="Sdk" />
   </ItemGroup>
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Android.props b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Android.props
new file mode 100644
index 000000000000..3926a4b22a30
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Android.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' and '$(PublishAot)' != 'true' ">true</UseMonoRuntime>
+  </PropertyGroup>
+</Project>
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
index c4034f1f9f55..d10f9ae0ab04 100644
--- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
@@ -112,5 +112,6 @@
     <DefineConstants>$(GodotDefineConstants);$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)\Android.props" Condition=" '$(GodotTargetPlatform)' == 'android' " />
   <Import Project="$(MSBuildThisFileDirectory)\iOSNativeAOT.props" Condition=" '$(GodotTargetPlatform)' == 'ios' " />
 </Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
index d3720dcb727e..65fc7fca3071 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
@@ -240,7 +240,6 @@ private void _ExportBeginImpl(string[] features, bool isDebug, string path, long
                     {
                         publishOutputDir = Path.Combine(GodotSharpDirs.ProjectBaseOutputPath, "godot-publish-dotnet",
                             $"{buildConfig}-{runtimeIdentifier}");
-
                     }
 
                     outputPaths.Add(publishOutputDir);
@@ -317,6 +316,30 @@ private void _ExportBeginImpl(string[] features, bool isDebug, string path, long
                             {
                                 if (embedBuildResults)
                                 {
+                                    if (platform == OS.Platforms.Android)
+                                    {
+                                        if (IsSharedObject(Path.GetFileName(path)))
+                                        {
+                                            AddSharedObject(path, tags: new string[] { arch },
+                                                Path.Join(projectDataDirName,
+                                                    Path.GetRelativePath(publishOutputDir,
+                                                        Path.GetDirectoryName(path)!)));
+
+                                            return;
+                                        }
+
+                                        static bool IsSharedObject(string fileName)
+                                        {
+                                            if (fileName.EndsWith(".so") || fileName.EndsWith(".a")
+                                             || fileName.EndsWith(".jar") || fileName.EndsWith(".dex"))
+                                            {
+                                                return true;
+                                            }
+
+                                            return false;
+                                        }
+                                    }
+
                                     string filePath = SanitizeSlashes(Path.GetRelativePath(publishOutputDir, path));
                                     byte[] fileData = File.ReadAllBytes(path);
                                     string hash = Convert.ToBase64String(SHA512.HashData(fileData));
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp
index 48caae8523cc..5293c5c896b3 100644
--- a/modules/mono/mono_gd/gd_mono.cpp
+++ b/modules/mono/mono_gd/gd_mono.cpp
@@ -61,6 +61,14 @@ hostfxr_initialize_for_runtime_config_fn hostfxr_initialize_for_runtime_config =
 hostfxr_get_runtime_delegate_fn hostfxr_get_runtime_delegate = nullptr;
 hostfxr_close_fn hostfxr_close = nullptr;
 
+#ifndef TOOLS_ENABLED
+typedef int(CORECLR_DELEGATE_CALLTYPE *coreclr_create_delegate_fn)(void *hostHandle, unsigned int domainId, const char *entryPointAssemblyName, const char *entryPointTypeName, const char *entryPointMethodName, void **delegate);
+typedef int(CORECLR_DELEGATE_CALLTYPE *coreclr_initialize_fn)(const char *exePath, const char *appDomainFriendlyName, int propertyCount, const char **propertyKeys, const char **propertyValues, void **hostHandle, unsigned int *domainId);
+
+coreclr_create_delegate_fn coreclr_create_delegate = nullptr;
+coreclr_initialize_fn coreclr_initialize = nullptr;
+#endif
+
 #ifdef _WIN32
 static_assert(sizeof(char_t) == sizeof(char16_t));
 using HostFxrCharString = Char16String;
@@ -142,6 +150,56 @@ String find_hostfxr() {
 #endif
 }
 
+#ifndef TOOLS_ENABLED
+String find_monosgen() {
+#if defined(ANDROID_ENABLED)
+	// Android includes all native libraries in the libs directory of the APK
+	// so we assume it exists and use only the name to dlopen it.
+	return "libmonosgen-2.0.so";
+#else
+#if defined(WINDOWS_ENABLED)
+	String probe_path = GodotSharpDirs::get_api_assemblies_dir()
+								.path_join("monosgen-2.0.dll");
+#elif defined(MACOS_ENABLED)
+	String probe_path = GodotSharpDirs::get_api_assemblies_dir()
+								.path_join("libmonosgen-2.0.dylib");
+#elif defined(UNIX_ENABLED)
+	String probe_path = GodotSharpDirs::get_api_assemblies_dir()
+								.path_join("libmonosgen-2.0.so");
+#else
+#error "Platform not supported (yet?)"
+#endif
+
+	if (FileAccess::exists(probe_path)) {
+		return probe_path;
+	}
+
+	return String();
+#endif
+}
+
+String find_coreclr() {
+#if defined(WINDOWS_ENABLED)
+	String probe_path = GodotSharpDirs::get_api_assemblies_dir()
+								.path_join("coreclr.dll");
+#elif defined(MACOS_ENABLED)
+	String probe_path = GodotSharpDirs::get_api_assemblies_dir()
+								.path_join("libcoreclr.dylib");
+#elif defined(UNIX_ENABLED)
+	String probe_path = GodotSharpDirs::get_api_assemblies_dir()
+								.path_join("libcoreclr.so");
+#else
+#error "Platform not supported (yet?)"
+#endif
+
+	if (FileAccess::exists(probe_path)) {
+		return probe_path;
+	}
+
+	return String();
+}
+#endif
+
 bool load_hostfxr(void *&r_hostfxr_dll_handle) {
 	String hostfxr_path = find_hostfxr();
 
@@ -182,6 +240,47 @@ bool load_hostfxr(void *&r_hostfxr_dll_handle) {
 			hostfxr_close);
 }
 
+#ifndef TOOLS_ENABLED
+bool load_coreclr(void *&r_coreclr_dll_handle) {
+	String coreclr_path = find_coreclr();
+
+	bool is_monovm = false;
+	if (coreclr_path.is_empty()) {
+		// Fallback to MonoVM (should have the same API as CoreCLR).
+		coreclr_path = find_monosgen();
+		is_monovm = true;
+	}
+
+	if (coreclr_path.is_empty()) {
+		return false;
+	}
+
+	const String coreclr_name = is_monovm ? "monosgen" : "coreclr";
+	print_verbose("Found " + coreclr_name + ": " + coreclr_path);
+
+	Error err = OS::get_singleton()->open_dynamic_library(coreclr_path, r_coreclr_dll_handle);
+
+	if (err != OK) {
+		return false;
+	}
+
+	void *lib = r_coreclr_dll_handle;
+
+	void *symbol = nullptr;
+
+	err = OS::get_singleton()->get_dynamic_library_symbol_handle(lib, "coreclr_initialize", symbol);
+	ERR_FAIL_COND_V(err != OK, false);
+	coreclr_initialize = (coreclr_initialize_fn)symbol;
+
+	err = OS::get_singleton()->get_dynamic_library_symbol_handle(lib, "coreclr_create_delegate", symbol);
+	ERR_FAIL_COND_V(err != OK, false);
+	coreclr_create_delegate = (coreclr_create_delegate_fn)symbol;
+
+	return (coreclr_initialize &&
+			coreclr_create_delegate);
+}
+#endif
+
 #ifdef TOOLS_ENABLED
 load_assembly_and_get_function_pointer_fn initialize_hostfxr_for_config(const char_t *p_config_path) {
 	hostfxr_handle cxt = nullptr;
@@ -339,6 +438,56 @@ godot_plugins_initialize_fn try_load_native_aot_library(void *&r_aot_dll_handle)
 }
 #endif
 
+#ifndef TOOLS_ENABLED
+String make_tpa_list() {
+	String tpa_list;
+
+#if defined(WINDOWS_ENABLED)
+	String separator = ";";
+#else
+	String separator = ":";
+#endif
+
+	String assemblies_dir = GodotSharpDirs::get_api_assemblies_dir();
+	PackedStringArray files = DirAccess::get_files_at(assemblies_dir);
+	for (const String &file : files) {
+		tpa_list += assemblies_dir.path_join(file);
+		tpa_list += separator;
+	}
+
+	return tpa_list;
+}
+
+godot_plugins_initialize_fn initialize_coreclr_and_godot_plugins(bool &r_runtime_initialized) {
+	godot_plugins_initialize_fn godot_plugins_initialize = nullptr;
+
+	String assembly_name = path::get_csharp_project_name();
+
+	String tpa_list = make_tpa_list();
+	const char *prop_keys[] = { HOSTFXR_STR("TRUSTED_PLATFORM_ASSEMBLIES") };
+	const char *prop_values[] = { get_data(str_to_hostfxr(tpa_list)) };
+	int nprops = sizeof(prop_keys) / sizeof(prop_keys[0]);
+
+	void *coreclr_handle = nullptr;
+	unsigned int domain_id = 0;
+	int rc = coreclr_initialize(nullptr, nullptr, nprops, (const char **)&prop_keys, (const char **)&prop_values, &coreclr_handle, &domain_id);
+	ERR_FAIL_COND_V_MSG(rc != 0, nullptr, ".NET: Failed to initialize CoreCLR.");
+
+	r_runtime_initialized = true;
+
+	print_verbose(".NET: CoreCLR initialized");
+
+	coreclr_create_delegate(coreclr_handle, domain_id,
+			get_data(str_to_hostfxr(assembly_name)),
+			HOSTFXR_STR("GodotPlugins.Game.Main"),
+			HOSTFXR_STR("InitializeFromGameProject"),
+			(void **)&godot_plugins_initialize);
+	ERR_FAIL_NULL_V_MSG(godot_plugins_initialize, nullptr, ".NET: Failed to get GodotPlugins initialization function pointer");
+
+	return godot_plugins_initialize;
+}
+#endif
+
 } // namespace
 
 bool GDMono::should_initialize() {
@@ -382,14 +531,21 @@ void GDMono::initialize() {
 	}
 #endif
 
-	if (!load_hostfxr(hostfxr_dll_handle)) {
+	if (load_hostfxr(hostfxr_dll_handle)) {
+		godot_plugins_initialize = initialize_hostfxr_and_godot_plugins(runtime_initialized);
+		ERR_FAIL_NULL(godot_plugins_initialize);
+	} else {
 #if !defined(TOOLS_ENABLED)
-		godot_plugins_initialize = try_load_native_aot_library(hostfxr_dll_handle);
-
-		if (godot_plugins_initialize != nullptr) {
-			is_native_aot = true;
-			runtime_initialized = true;
+		if (load_coreclr(coreclr_dll_handle)) {
+			godot_plugins_initialize = initialize_coreclr_and_godot_plugins(runtime_initialized);
 		} else {
+			godot_plugins_initialize = try_load_native_aot_library(hostfxr_dll_handle);
+			if (godot_plugins_initialize != nullptr) {
+				runtime_initialized = true;
+			}
+		}
+
+		if (godot_plugins_initialize == nullptr) {
 			ERR_FAIL_MSG(".NET: Failed to load hostfxr");
 		}
 #else
@@ -400,11 +556,6 @@ void GDMono::initialize() {
 #endif
 	}
 
-	if (!is_native_aot) {
-		godot_plugins_initialize = initialize_hostfxr_and_godot_plugins(runtime_initialized);
-		ERR_FAIL_NULL(godot_plugins_initialize);
-	}
-
 	int32_t interop_funcs_size = 0;
 	const void **interop_funcs = godotsharp::get_runtime_interop_funcs(interop_funcs_size);
 
@@ -553,6 +704,9 @@ GDMono::~GDMono() {
 	if (hostfxr_dll_handle) {
 		OS::get_singleton()->close_dynamic_library(hostfxr_dll_handle);
 	}
+	if (coreclr_dll_handle) {
+		OS::get_singleton()->close_dynamic_library(coreclr_dll_handle);
+	}
 
 	finalizing_scripts_domain = false;
 	runtime_initialized = false;
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index 614bfc63fb6e..fae3421ac9ec 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -64,7 +64,7 @@ class GDMono {
 	bool finalizing_scripts_domain = false;
 
 	void *hostfxr_dll_handle = nullptr;
-	bool is_native_aot = false;
+	void *coreclr_dll_handle = nullptr;
 
 	String project_assembly_path;
 	uint64_t project_assembly_modified_time = 0;
diff --git a/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar b/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar
new file mode 100755
index 0000000000000000000000000000000000000000..736603088187993cf62014b17e619502133dc211
GIT binary patch
literal 8552
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
I$o{(fAB|b+00000

literal 0
HcmV?d00001

diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index a4052b8b7523..92977c14f33d 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -2381,19 +2381,6 @@ bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref<Edito
 #ifdef MODULE_MONO_ENABLED
 	// Android export is still a work in progress, keep a message as a warning.
 	err += TTR("Exporting to Android when using C#/.NET is experimental.") + "\n";
-
-	bool unsupported_arch = false;
-	Vector<ABI> enabled_abis = get_enabled_abis(p_preset);
-	for (ABI abi : enabled_abis) {
-		if (abi.arch != "arm64" && abi.arch != "x86_64") {
-			err += vformat(TTR("Android architecture %s not supported in C# projects."), abi.arch) + "\n";
-			unsupported_arch = true;
-		}
-	}
-	if (unsupported_arch) {
-		r_error = err;
-		return false;
-	}
 #endif
 
 	// Look for export templates (first official, and if defined custom templates).
@@ -3201,6 +3188,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		PluginConfigAndroid::get_plugins_custom_maven_repos(enabled_plugins, android_dependencies_maven_repos);
 #endif // DISABLE_DEPRECATED
 
+		bool has_dotnet_project = false;
 		Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
 		for (int i = 0; i < export_plugins.size(); i++) {
 			if (export_plugins[i]->supports_platform(Ref<EditorExportPlatform>(this))) {
@@ -3218,6 +3206,11 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 				PackedStringArray export_plugin_android_dependencies_maven_repos = export_plugins[i]->get_android_dependencies_maven_repos(Ref<EditorExportPlatform>(this), p_debug);
 				android_dependencies_maven_repos.append_array(export_plugin_android_dependencies_maven_repos);
 			}
+
+			PackedStringArray features = export_plugins[i]->get_export_features(Ref<EditorExportPlatform>(this), p_debug);
+			if (features.has("dotnet")) {
+				has_dotnet_project = true;
+			}
 		}
 
 		bool clean_build_required = _is_clean_build_required(p_preset);
@@ -3231,12 +3224,13 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 			cmdline.push_back("clean");
 		}
 
+		String edition = has_dotnet_project ? "Mono" : "Standard";
 		String build_type = p_debug ? "Debug" : "Release";
 		if (export_format == EXPORT_FORMAT_AAB) {
 			String bundle_build_command = vformat("bundle%s", build_type);
 			cmdline.push_back(bundle_build_command);
 		} else if (export_format == EXPORT_FORMAT_APK) {
-			String apk_build_command = vformat("assemble%s", build_type);
+			String apk_build_command = vformat("assemble%s%s", edition, build_type);
 			cmdline.push_back(apk_build_command);
 		}
 
@@ -3319,6 +3313,8 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		copy_args.push_back("-p"); // argument to specify the start directory.
 		copy_args.push_back(build_path); // start directory.
 
+		copy_args.push_back("-Pexport_edition=" + edition.to_lower());
+
 		copy_args.push_back("-Pexport_build_type=" + build_type.to_lower());
 
 		String export_format_arg = export_format == EXPORT_FORMAT_AAB ? "aab" : "apk";
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
index b4e1e37ec767..10a56e01219a 100644
--- a/platform/android/java/app/build.gradle
+++ b/platform/android/java/app/build.gradle
@@ -29,6 +29,8 @@ allprojects {
 configurations {
     // Initializes a placeholder for the devImplementation dependency configuration.
     devImplementation {}
+    // Initializes a placeholder for the monoImplementation dependency configuration.
+    monoImplementation {}
 }
 
 dependencies {
@@ -42,9 +44,9 @@ dependencies {
     } else {
         // Godot gradle build mode. In this scenario this project is the only one around and the Godot
         // library is available through the pre-generated godot-lib.*.aar android archive files.
-        debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar', '*.aar'])
-        devImplementation fileTree(dir: 'libs/dev', include: ['*.jar', '*.aar'])
-        releaseImplementation fileTree(dir: 'libs/release', include: ['*.jar', '*.aar'])
+        debugImplementation fileTree(dir: 'libs/debug', include: ['**/*.jar', '*.aar'])
+        devImplementation fileTree(dir: 'libs/dev', include: ['**/*.jar', '*.aar'])
+        releaseImplementation fileTree(dir: 'libs/release', include: ['**/*.jar', '*.aar'])
     }
 
     // Godot user plugins remote dependencies
@@ -60,6 +62,12 @@ dependencies {
     if (pluginsBinaries != null && pluginsBinaries.size() > 0) {
         implementation files(pluginsBinaries)
     }
+
+    // .NET dependencies
+    String jar = '../../../../modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar'
+    if (file(jar).exists()) {
+        monoImplementation files(jar)
+    }
 }
 
 android {
@@ -155,6 +163,10 @@ android {
         }
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
 
         debug {
@@ -192,6 +204,13 @@ android {
         }
     }
 
+    flavorDimensions 'edition'
+
+    productFlavors {
+        standard {}
+        mono {}
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -207,7 +226,8 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            output.outputFileName = "android_${variant.name}.apk"
+            String filenameSuffix = variant.flavorName == "mono" ? variant.name : variant.buildType.name
+            output.outputFileName = "android_${filenameSuffix}.apk"
         }
     }
 }
@@ -220,12 +240,20 @@ task copyAndRenameBinary(type: Copy) {
 
     String exportPath = getExportPath()
     String exportFilename = getExportFilename()
+    String exportEdition = getExportEdition()
     String exportBuildType = getExportBuildType()
+    String exportBuildTypeCapitalized = exportBuildType.capitalize()
     String exportFormat = getExportFormat()
 
     boolean isAab = exportFormat == "aab"
-    String sourceFilepath = isAab ? "$buildDir/outputs/bundle/$exportBuildType/build-${exportBuildType}.aab" : "$buildDir/outputs/apk/$exportBuildType/android_${exportBuildType}.apk"
-    String sourceFilename = isAab ? "build-${exportBuildType}.aab" : "android_${exportBuildType}.apk"
+    boolean isMono = exportEdition == "mono"
+    String filenameSuffix = exportBuildType
+    if (isMono) {
+        filenameSuffix = isAab ? "${exportEdition}-${exportBuildType}" : "${exportEdition}${exportBuildTypeCapitalized}"
+    }
+
+    String sourceFilename = isAab ? "build-${filenameSuffix}.aab" : "android_${filenameSuffix}.apk"
+    String sourceFilepath = isAab ? "$buildDir/outputs/bundle/${exportEdition}${exportBuildTypeCapitalized}/$sourceFilename" : "$buildDir/outputs/apk/$exportEdition/$exportBuildType/$sourceFilename"
 
     from sourceFilepath
     into exportPath
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
index 611a9c4a4022..597a4d5c1456 100644
--- a/platform/android/java/app/config.gradle
+++ b/platform/android/java/app/config.gradle
@@ -224,6 +224,14 @@ ext.getExportFilename = {
     return exportFilename
 }
 
+ext.getExportEdition = {
+    String exportEdition = project.hasProperty("export_edition") ? project.property("export_edition") : ""
+    if (exportEdition == null || exportEdition.isEmpty()) {
+        exportEdition = "standard"
+    }
+    return exportEdition
+}
+
 ext.getExportBuildType = {
     String exportBuildType = project.hasProperty("export_build_type") ? project.property("export_build_type") : ""
     if (exportBuildType == null || exportBuildType.isEmpty()) {
diff --git a/platform/android/java/app/src/com/godot/game/GodotApp.java b/platform/android/java/app/src/com/godot/game/GodotApp.java
index 1098eacb0caa..104dbe262064 100644
--- a/platform/android/java/app/src/com/godot/game/GodotApp.java
+++ b/platform/android/java/app/src/com/godot/game/GodotApp.java
@@ -33,14 +33,29 @@
 import app.blazium.godot.GodotActivity;
 
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.core.splashscreen.SplashScreen;
 
+import com.godot.game.BuildConfig;
+
 /**
  * Template activity for Godot Android builds.
  * Feel free to extend and modify this class for your custom logic.
  */
 public class GodotApp extends GodotActivity {
+	static {
+		// .NET libraries.
+		if (BuildConfig.FLAVOR.equals("mono")) {
+			try {
+				Log.v("GODOT", "Loading System.Security.Cryptography.Native.Android library");
+				System.loadLibrary("System.Security.Cryptography.Native.Android");
+			} catch (UnsatisfiedLinkError e) {
+				Log.e("GODOT", "Unable to load System.Security.Cryptography.Native.Android library");
+			}
+		}
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		SplashScreen.installSplashScreen(this);
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index f938660259e8..fbd9f9193499 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -30,6 +30,7 @@ ext {
         "editor": ["dev", "debug", "release"],
         "template": ["dev", "debug", "release"]
     ]
+    supportedEditions = ["standard", "mono"]
 
     // Used by gradle to specify which architecture to build for by default when running
     // `./gradlew build` (this command is usually used by Android Studio).
@@ -53,7 +54,7 @@ def getSconsTaskName(String flavor, String buildType, String abi) {
  * The zip file also includes some gradle tools to enable gradle builds from the Godot Editor.
  */
 task zipGradleBuild(type: Zip) {
-    onlyIf { generateGodotTemplates.state.executed || generateDevTemplate.state.executed }
+    onlyIf { generateGodotTemplates.state.executed || generateGodotMonoTemplates.state.executed || generateDevTemplate.state.executed }
     doFirst {
         logger.lifecycle("Generating Blazium gradle build template")
     }
@@ -94,15 +95,22 @@ def templateExcludedBuildTask() {
 /**
  * Generates the build tasks for the given flavor
  * @param flavor Must be one of the supported flavors ('template' / 'editor')
+ * @param edition Must be one of the supported editions ('standard' / 'mono')
  * @param androidDistro Must be one of the supported Android distributions ('android' / 'horizonos')
  */
-def generateBuildTasks(String flavor = "template", String androidDistro = "android") {
+def generateBuildTasks(String flavor = "template", String edition = "standard", String androidDistro = "android") {
     if (!supportedFlavors.contains(flavor)) {
         throw new GradleException("Invalid build flavor: $flavor")
     }
     if (!supportedAndroidDistributions.contains(androidDistro)) {
         throw new GradleException("Invalid Android distribution: $androidDistro")
     }
+    if (!supportedEditions.contains(edition)) {
+        throw new GradleException("Invalid build edition: $edition")
+    }
+    if (edition == "mono" && flavor != "template") {
+        throw new GradleException("'mono' edition only supports the 'template' flavor.")
+    }
 
     String capitalizedAndroidDistro = androidDistro.capitalize()
     def buildTasks = []
@@ -126,6 +134,7 @@ def generateBuildTasks(String flavor = "template", String androidDistro = "andro
             && targetLibs.listFiles().length > 0)) {
 
             String capitalizedTarget = target.capitalize()
+            String capitalizedEdition = edition.capitalize()
             if (isTemplate) {
                 // Copy the Godot android library archive file into the app module libs directory.
                 // Depends on the library build task to ensure the AAR file is generated prior to copying.
@@ -157,15 +166,16 @@ def generateBuildTasks(String flavor = "template", String androidDistro = "andro
 
                 // Copy the generated binary template into the Godot bin directory.
                 // Depends on the app build task to ensure the binary is generated prior to copying.
-                String copyBinaryTaskName = "copy${capitalizedTarget}BinaryToBin"
+                String copyBinaryTaskName = "copy${capitalizedEdition}${capitalizedTarget}BinaryToBin"
                 if (tasks.findByName(copyBinaryTaskName) != null) {
                     buildTasks += tasks.getByName(copyBinaryTaskName)
                 } else {
                     buildTasks += tasks.create(name: copyBinaryTaskName, type: Copy) {
-                        dependsOn ":app:assemble${capitalizedTarget}"
-                        from("app/build/outputs/apk/${target}")
+                        String filenameSuffix = edition == "mono" ? "${edition}${capitalizedTarget}" : target
+                        dependsOn ":app:assemble${capitalizedEdition}${capitalizedTarget}"
+                        from("app/build/outputs/apk/${edition}/${target}")
                         into(binDir)
-                        include("android_${target}.apk")
+                        include("android_${filenameSuffix}.apk")
                     }
                 }
             } else {
@@ -212,7 +222,7 @@ def generateBuildTasks(String flavor = "template", String androidDistro = "andro
  */
 task generateGodotEditor {
     gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
-    dependsOn = generateBuildTasks("editor", "android")
+    dependsOn = generateBuildTasks("editor", "standard", "android")
 }
 
 /**
@@ -224,7 +234,7 @@ task generateGodotEditor {
  */
 task generateGodotHorizonOSEditor {
     gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
-    dependsOn = generateBuildTasks("editor", "horizonos")
+    dependsOn = generateBuildTasks("editor", "standard", "horizonos")
 }
 
 /**
@@ -237,6 +247,17 @@ task generateGodotTemplates {
     finalizedBy 'zipGradleBuild'
 }
 
+/**
+ * Master task used to coordinate the tasks defined above to generate the set of Godot templates
+ * for the 'mono' edition of the engine.
+ */
+task generateGodotMonoTemplates {
+    gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
+    dependsOn = generateBuildTasks("template", "mono")
+
+    finalizedBy 'zipGradleBuild'
+}
+
 /**
  * Generates the same output as generateGodotTemplates but with dev symbols
  */
@@ -295,6 +316,9 @@ task cleanGodotTemplates(type: Delete) {
     delete("$binDir/android_debug.apk")
     delete("$binDir/android_dev.apk")
     delete("$binDir/android_release.apk")
+    delete("$binDir/android_monoDebug.apk")
+    delete("$binDir/android_monoDev.apk")
+    delete("$binDir/android_monoRelease.apk")
     delete("$binDir/android_source.zip")
     delete("$binDir/godot-lib.template_debug.aar")
     delete("$binDir/godot-lib.template_debug.dev.aar")