SDL: fix for loading libiconv

This commit is contained in:
Sergii Pylypenko
2018-12-05 19:49:59 +02:00
parent 969d785ec1
commit bf0eb74ea8
3 changed files with 5 additions and 2 deletions

View File

@@ -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");
}
}
}

View File

@@ -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