Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-25 09:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 4739 - Android: loading native libs, generated by bundletool (Thanks akk0rd87)

Browse Source
This commit is contained in:
Sylvain Becker 2019-07-27 20:21:42 +02:00
parent 39e8b007a7
commit 18bcafffce
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/android/SDL_android.c
View File

@ -629,6 +629,17 @@ JNIEXPORT int JNICALL SDL_JAVA_INTERFACE(nativeRunMain)(JNIEnv *env, jclass cls,
library_file = (*env)->GetStringUTFChars(env, library, NULL); library_file = (*env)->GetStringUTFChars(env, library, NULL);
library_handle = dlopen(library_file, RTLD_GLOBAL); library_handle = dlopen(library_file, RTLD_GLOBAL);
if (!library_handle) {
/* When deploying android app bundle format uncompressed native libs may not extract from apk to filesystem.
In this case we should use lib name without path. https://bugzilla.libsdl.org/show_bug.cgi?id=4739 */
const char *library_name = SDL_strrchr(library_file, '/');
if (library_name && *library_name) {
library_name += 1;
library_handle = dlopen(library_name, RTLD_GLOBAL);
}
}
if (library_handle) { if (library_handle) {
const char *function_name; const char *function_name;
SDL_main_func SDL_main; SDL_main_func SDL_main;