noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[Android] Fix GDExtension export and loading.

Browse Source
This commit is contained in:
bruvzg
2022-11-07 12:56:20 +02:00
parent 2f0d3d5424
commit 6033668bed
3 changed files with 83 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/os_android.cpp
View File

@@ -162,11 +162,16 @@ Vector<String> OS_Android::get_granted_permissions() const {
}
Error OS_Android::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path, String *r_resolved_path) {
p_library_handle = dlopen(p_path.utf8().get_data(), RTLD_NOW);
String path = p_path;
if (!FileAccess::exists(path)) {
path = p_path.get_file();
}
p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW);
ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, "Can't open dynamic library: " + p_path + ", error: " + dlerror() + ".");
if (r_resolved_path != nullptr) {
*r_resolved_path = p_path;
*r_resolved_path = path;
}
return OK;