diff --git a/android/vcmi-app/src/main/java/eu/vcmi/vcmi/util/LibsLoader.java b/android/vcmi-app/src/main/java/eu/vcmi/vcmi/util/LibsLoader.java index 2a3fd7827..1df9bd4ff 100644 --- a/android/vcmi-app/src/main/java/eu/vcmi/vcmi/util/LibsLoader.java +++ b/android/vcmi-app/src/main/java/eu/vcmi/vcmi/util/LibsLoader.java @@ -12,54 +12,15 @@ import eu.vcmi.vcmi.NativeMethods; */ public final class LibsLoader { - private static void loadLib(final String libName, final boolean onlyForOldApis) - { - if (!onlyForOldApis || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) - { - Log.v("Loading native lib: " + libName); - SDL.loadLibrary(libName); - } - } - - private static void loadCommon() - { - loadLib("c++_shared", true); - loadLib("iconv", true); - loadLib("boost-system", true); - loadLib("boost-datetime", true); - loadLib("boost-locale", true); - loadLib("boost-filesystem", true); - loadLib("boost-program-options", true); - loadLib("boost-thread", true); - loadLib("SDL2", false); - loadLib("x264", true); - loadLib("avutil", true); - loadLib("swscale", true); - loadLib("swresample", true); - loadLib("postproc", true); - loadLib("avcodec", true); - loadLib("avformat", true); - loadLib("avfilter", true); - loadLib("avdevice", true); - loadLib("minizip", true); - loadLib("vcmi-fuzzylite", true); - loadLib("vcmi-lib", true); - loadLib("SDL2_image", false); - loadLib("SDL2_mixer", false); - loadLib("SDL2_ttf", false); - } - public static void loadClientLibs(Context ctx) { - loadCommon(); - loadLib("vcmiclient", false); + SDL.loadLibrary("vcmiclient"); SDL.setContext(ctx); } public static void loadServerLibs() { - loadCommon(); - loadLib("vcmiserver", false); + SDL.loadLibrary("vcmiserver"); NativeMethods.initClassloader(); } }