Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #971 from jmakovicka/r1.9

Browse source 
Tolerate missing jnigraphics lib on Lollipop
This commit is contained in:
Alexey Pelykh 2014-11-25 17:26:20 +02:00
commit 8d75159aec
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java
View file

@ -49,7 +49,12 @@ public class NativeOsmandLibrary extends NativeLibrary {
System.loadLibrary("cpufeatures_proxy"); System.loadLibrary("cpufeatures_proxy");
if (android.os.Build.VERSION.SDK_INT >= 8) { if (android.os.Build.VERSION.SDK_INT >= 8) {
log.debug("Loading jnigraphics, since Android >= 2.2 ..."); //$NON-NLS-1$ log.debug("Loading jnigraphics, since Android >= 2.2 ..."); //$NON-NLS-1$
System.loadLibrary("jnigraphics"); try {
System.loadLibrary("jnigraphics");
} catch( UnsatisfiedLinkError e ) {
// handle "Shared library already opened" error
log.debug("Failed to load jnigraphics: " + e); //$NON-NLS-1$
}
} }
final String libCpuSuffix = cpuHasNeonSupport() ? "_neon" : ""; final String libCpuSuffix = cpuHasNeonSupport() ? "_neon" : "";
log.debug("Loading native libraries..."); //$NON-NLS-1$ log.debug("Loading native libraries..."); //$NON-NLS-1$