diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 084eb1f18..5279509e8 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -1195,6 +1195,7 @@ public class MainActivity extends Activity File libpath = new File(getFilesDir().getAbsolutePath() + "/../lib/" + libname); Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath()); System.load(libpath.getPath()); + Log.i("SDL", "libSDL: loaded lib " + libpath.getAbsolutePath()); } catch( UnsatisfiedLinkError e ) { @@ -1205,11 +1206,13 @@ public class MainActivity extends Activity File libpath = new File(getFilesDir().getAbsolutePath() + "/" + libname); Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath()); System.load(libpath.getPath()); + Log.i("SDL", "libSDL: loaded lib " + libpath.getAbsolutePath()); } catch( UnsatisfiedLinkError ee ) { Log.i("SDL", "libSDL: error loading lib " + l + ": " + ee.toString()); System.loadLibrary(l); + Log.i("SDL", "libSDL: loaded lib " + l + " from app lib path"); } } } diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index b57a87ed8..65b292ea7 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -269,7 +269,7 @@ APP_PLATFORM= # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi-v7a x86 arm64-v8a x86_64 -MultiABI='armeabi-v7a arm64-v8a x86 x86_64' +MultiABI='arm64-v8a' # armeabi-v7a x86 x86_64 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed diff --git a/project/jni/iconv/src b/project/jni/iconv/src index 77c9e6c31..3265ce98e 160000 --- a/project/jni/iconv/src +++ b/project/jni/iconv/src @@ -1 +1 @@ -Subproject commit 77c9e6c31e2dc1c5273dfc4b09903957caaf53ca +Subproject commit 3265ce98ed76be7e62fdc61f0a358fb42ccbd97e