Tolerate missing jnigraphics lib on Lollipop

This commit is contained in:
Jindřich Makovička 2014-11-25 06:08:00 +01:00
parent 6bd4cd64e8
commit 2e1a1954d7

View file

@ -49,7 +49,14 @@ public class NativeOsmandLibrary extends NativeLibrary {
System.loadLibrary("cpufeatures_proxy");
if (android.os.Build.VERSION.SDK_INT >= 8) {
log.debug("Loading jnigraphics, since Android >= 2.2 ..."); //$NON-NLS-1$
try {
System.loadLibrary("jnigraphics");
} catch( UnsatisfiedLinkError e ) {
// tolerate missing jnigraphics on Lollipop
log.debug("Failed to load jnigraphics: " + e); //$NON-NLS-1$
if (android.os.Build.VERSION.SDK_INT <= 20)
throw e;
}
}
final String libCpuSuffix = cpuHasNeonSupport() ? "_neon" : "";
log.debug("Loading native libraries..."); //$NON-NLS-1$