Update OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java

This commit is contained in:
Alexey Pelykh 2013-02-19 20:21:00 +02:00
parent 8a071a05a3
commit b756ec829f

View file

@ -32,20 +32,30 @@ public class NativeOsmandLibrary extends NativeLibrary {
System.loadLibrary("gnustl_shared"); System.loadLibrary("gnustl_shared");
log.debug("Loading native cpufeatures_proxy..."); //$NON-NLS-1$ log.debug("Loading native cpufeatures_proxy..."); //$NON-NLS-1$
System.loadLibrary("cpufeatures_proxy"); System.loadLibrary("cpufeatures_proxy");
if (PlatformUtil.AVIAN_LIBRARY) { /*(if (PlatformUtil.AVIAN_LIBRARY) {
log.debug("Loading load routing test..."); //$NON-NLS-1$ log.debug("Loading load routing test..."); //$NON-NLS-1$
System.loadLibrary("routing_test"); System.loadLibrary("routing_test");
testRoutingPing(); testRoutingPing();
} }*/
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"); System.loadLibrary("jnigraphics");
} }
if(!cpuHasNeonSupport()) { if(!cpuHasNeonSupport()) {
log.debug("Loading native osmand..."); //$NON-NLS-1$ log.debug("Loading native osmand..."); //$NON-NLS-1$
System.loadLibrary("Qt5Core");
System.loadLibrary("Qt5Network");
System.loadLibrary("Qt5Concurrent");
System.loadLibrary("Qt5Sql");
System.loadLibrary("Qt5Xml");
System.loadLibrary("osmand"); System.loadLibrary("osmand");
} else { } else {
log.debug("Loading native osmand with NEON..."); //$NON-NLS-1$ log.debug("Loading native osmand with NEON..."); //$NON-NLS-1$
System.loadLibrary("Qt5Core_neon");
System.loadLibrary("Qt5Network_neon");
System.loadLibrary("Qt5Concurrent_neon");
System.loadLibrary("Qt5Sql_neon");
System.loadLibrary("Qt5Xml_neon");
System.loadLibrary("osmand_neon"); System.loadLibrary("osmand_neon");
} }
log.debug("Creating NativeOsmandLibrary instance..."); //$NON-NLS-1$ log.debug("Creating NativeOsmandLibrary instance..."); //$NON-NLS-1$