6 files changed, 19 insertions, 5 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 98b3ecdeff..fea8ec3287 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -69,6 +69,7 @@ def get_flags():
     return [
         ("arch", "arm64"),  # Default for convenience.
         ("target", "template_debug"),
+        ("supported", ["mono"]),
     ]
 
 
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index d0db7b2e6c..a485b57a64 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -1911,13 +1911,22 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
 }
 
 bool EditorExportPlatformAndroid::get_export_option_visibility(const EditorExportPreset *p_preset, const String &p_option) const {
+	if (p_preset == nullptr) {
+		return true;
+	}
+
+	bool advanced_options_enabled = p_preset->are_advanced_options_enabled();
+	if (p_option == "graphics/opengl_debug" ||
+			p_option == "command_line/extra_args" ||
+			p_option == "permissions/custom_permissions") {
+		return advanced_options_enabled;
+	}
 	if (p_option == "gradle_build/gradle_build_directory" || p_option == "gradle_build/android_source_template") {
-		// @todo These are experimental options - keep them hidden for now.
-		//return (bool)p_preset->get("gradle_build/use_gradle_build");
-		return false;
-	} else if (p_option == "custom_template/debug" || p_option == "custom_template/release") {
+		return advanced_options_enabled && bool(p_preset->get("gradle_build/use_gradle_build"));
+	}
+	if (p_option == "custom_template/debug" || p_option == "custom_template/release") {
 		// The APK templates are ignored if Gradle build is enabled.
-		return !p_preset->get("gradle_build/use_gradle_build");
+		return advanced_options_enabled && !bool(p_preset->get("gradle_build/use_gradle_build"));
 	}
 	return true;
 }
diff --git a/platform/ios/detect.py b/platform/ios/detect.py
index 9f929ddf0a..4d6e3ae9ba 100644
--- a/platform/ios/detect.py
+++ b/platform/ios/detect.py
@@ -51,6 +51,7 @@ def get_flags():
         ("arch", "arm64"),  # Default for convenience.
         ("target", "template_debug"),
         ("use_volk", False),
+        ("supported", ["mono"]),
     ]
 
 
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index 8fbd8b10b1..4856076436 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -67,6 +67,7 @@ def get_doc_path():
 def get_flags():
     return [
         ("arch", detect_arch()),
+        ("supported", ["mono"]),
     ]
 
 
diff --git a/platform/macos/detect.py b/platform/macos/detect.py
index cfbe9a8ee7..9150a527a5 100644
--- a/platform/macos/detect.py
+++ b/platform/macos/detect.py
@@ -56,6 +56,7 @@ def get_flags():
     return [
         ("arch", detect_arch()),
         ("use_volk", False),
+        ("supported", ["mono"]),
     ]
 
 
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index f536c1ac27..4585884859 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -248,6 +248,7 @@ def get_flags():
 
     return [
         ("arch", arch),
+        ("supported", ["mono"]),
     ]