Mono/C#: Several android fixes

- Added correct config file for android dllmaps.
- Fix __Internal DllImports with a dlopen fallback.
- Add missing P/Invoke functions and internal calls expected by the monodroid BCL and our custom version of the 'Android.Runtime.AndroidEnvironment' class (this last one can be found in the godot-mono-builds repo).
- Make sure to set 'btls' instead of 'legacy' as the default TLS provider on Android.

1 files changed, 17 insertions, 8 deletions

diff --git a/modules/mono/editor/godotsharp_export.cpp b/modules/mono/editor/godotsharp_export.cpp
index 9ae9399e1d..e02bd3be58 100644
--- a/modules/mono/editor/godotsharp_export.cpp
+++ b/modules/mono/editor/godotsharp_export.cpp
@@ -101,23 +101,32 @@ Error get_assembly_dependencies(GDMonoAssembly *p_assembly, const Vector<String>
 	return OK;
 }
 
-Error get_exported_assembly_dependencies(const String &p_project_dll_name, const String &p_project_dll_src_path, const String &p_build_config, const String &p_custom_bcl_dir, Dictionary &r_dependencies) {
+Error get_exported_assembly_dependencies(const Dictionary &p_initial_dependencies,
+		const String &p_build_config, const String &p_custom_bcl_dir, Dictionary &r_dependencies) {
 	MonoDomain *export_domain = GDMonoUtils::create_domain("GodotEngine.Domain.ProjectExport");
 	ERR_FAIL_NULL_V(export_domain, FAILED);
 	_GDMONO_SCOPE_EXIT_DOMAIN_UNLOAD_(export_domain);
 
 	_GDMONO_SCOPE_DOMAIN_(export_domain);
 
-	GDMonoAssembly *scripts_assembly = NULL;
-	bool load_success = GDMono::get_singleton()->load_assembly_from(p_project_dll_name,
-			p_project_dll_src_path, &scripts_assembly, /* refonly: */ true);
-
-	ERR_FAIL_COND_V_MSG(!load_success, ERR_CANT_RESOLVE, "Cannot load assembly (refonly): '" + p_project_dll_name + "'.");
-
 	Vector<String> search_dirs;
 	GDMonoAssembly::fill_search_dirs(search_dirs, p_build_config, p_custom_bcl_dir);
 
-	return get_assembly_dependencies(scripts_assembly, search_dirs, r_dependencies);
+	for (const Variant *key = p_initial_dependencies.next(); key; key = p_initial_dependencies.next(key)) {
+		String assembly_name = *key;
+		String assembly_path = p_initial_dependencies[*key];
+
+		GDMonoAssembly *assembly = NULL;
+		bool load_success = GDMono::get_singleton()->load_assembly_from(assembly_name, assembly_path, &assembly, /* refonly: */ true);
+
+		ERR_FAIL_COND_V_MSG(!load_success, ERR_CANT_RESOLVE, "Cannot load assembly (refonly): '" + assembly_name + "'.");
+
+		Error err = get_assembly_dependencies(assembly, search_dirs, r_dependencies);
+		if (err != OK)
+			return err;
+	}
+
+	return OK;
 }
 
 } // namespace GodotSharpExport