From 6a2dd96ac7ce5c0575e91290a983048c0e5e6d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Toma=C5=BEi=C4=8D?= Date: Thu, 20 Jun 2024 09:48:02 +0200 Subject: [PATCH] android: actually use ReLinker When loading libraries the `SDL.mContext` is still `null`. This results in relinker code path in `SDL.loadLibrary(...)` always throwing a null exception and fallbacking to system loader. Fix it by passing the context explicitly. --- .../app/src/main/java/org/libsdl/app/SDLActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index d0be4ee67..e204459ff 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -281,7 +281,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh // Load the .so public void loadLibraries() { for (String lib : getLibraries()) { - SDL.loadLibrary(lib); + SDL.loadLibrary(lib, this); } }