diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-03 08:13:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 08:13:34 +0200 |
| commit | c9ce4069a371da36ecbb0c1216ed5990498a4412 (patch) | |
| tree | 23082416355bb2fd3ae2965bf784329ade4c479d /platform/android | |
| parent | 0275d60c1b50737e2e52a0b60c97048941bb74c8 (diff) | |
| parent | 80f61352fb1b0bed251c06eb0a21a09374de77b3 (diff) | |
Merge pull request #60601 from touilleMan/gdextension_get_library_path
Add GDNativeInterface::get_library_path to GDExtension
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/os_android.cpp | 7 | ||||
| -rw-r--r-- | platform/android/os_android.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index fc46005b41..25daf1ca90 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -162,9 +162,14 @@ Vector<String> OS_Android::get_granted_permissions() const { return godot_java->get_granted_permissions(); } -Error OS_Android::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) { +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); ERR_FAIL_COND_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; + } + return OK; } diff --git a/platform/android/os_android.h b/platform/android/os_android.h index a40e17dc2c..f86c5b5212 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -90,7 +90,7 @@ public: virtual void alert(const String &p_alert, const String &p_title) override; - virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false) override; + virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr) override; virtual String get_name() const override; virtual MainLoop *get_main_loop() const override; |