fix: android clean up shared library names + add keyutils.so + fix SDL2 so import name

Author: Totto16

platforms/android/app/jni/Android.mk

@@ -15,82 +15,88 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libpng
+LOCAL_MODULE := png16
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libpng16.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := SDL2_ttf
+LOCAL_MODULE := sdl2_ttf
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2_ttf.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := SDL2_mixer
+LOCAL_MODULE := sdl2_mixer
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2mixer.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libvorbis
+LOCAL_MODULE := vorbis
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libvorbis.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libvorbisfile
+LOCAL_MODULE := vorbisfile
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libvorbisfile.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libogg
+LOCAL_MODULE := ogg
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libogg.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libflac
+LOCAL_MODULE := flac
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libFLAC.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := SDL2_image
+LOCAL_MODULE := sdl2_image
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2image.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libfmt
+LOCAL_MODULE := fmt
 LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libfmt.so)
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := liboopetris_core
+LOCAL_MODULE := keyutils
+LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libkeyutils.so)
+include $(PREBUILT_SHARED_LIBRARY)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := oopetris_core
 LIB_PATH := $(BUILD_PATH)/src/libs/core
 LOCAL_SRC_FILES := $(LIB_PATH)/liboopetris_core.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := liboopetris_recordings
+LOCAL_MODULE := oopetris_recordings
 LIB_PATH := $(BUILD_PATH)/src/libs/recordings
 LOCAL_SRC_FILES := $(LIB_PATH)/liboopetris_recordings.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := liboopetris_graphics
+LOCAL_MODULE := oopetris_graphics
 LIB_PATH := $(BUILD_PATH)/src
 LOCAL_SRC_FILES := $(LIB_PATH)/liboopetris_graphics.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := liboopetris
+LOCAL_MODULE := oopetris
 LIB_PATH := $(BUILD_PATH)/src/executables
 LOCAL_SRC_FILES := $(LIB_PATH)/liboopetris.so
 include $(PREBUILT_SHARED_LIBRARY)
@@ -99,7 +105,7 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := main
-LOCAL_SHARED_LIBRARIES := SDL2 SDL2_ttf freetype libpng SDL2_mixer libvorbis libvorbisfile libogg libflac SDL2_image libfmt liboopetris_core liboopetris_recordings liboopetris_graphics liboopetris
+LOCAL_SHARED_LIBRARIES := SDL2 sdl2_ttf freetype png16 sdl2_mixer vorbis vorbisfile ogg flac sdl2_image fmt keyutils oopetris_core oopetris_recordings oopetris_graphics oopetris
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
 LOCAL_LDFLAGS := -Wl,--no-undefined
 include $(BUILD_SHARED_LIBRARY)

platforms/android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -269,7 +269,7 @@ protected String getMainFunction() {
      */
     protected String[] getLibraries() {
         return new String[] {
-            "sdl2",
+            "SDL2",
             "sdl2image",
             "sdl2mixer",
             // "SDL2_net",