From b4b3ae0f806d7ad1fd263dffa91d8f5eb75a86f5 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 29 Jan 2013 09:44:01 +0100 Subject: [PATCH] Add avian support --- OsmAnd/src/net/osmand/LogUtil.java | 1 + .../src/net/osmand/plus/render/NativeOsmandLibrary.java | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/LogUtil.java b/OsmAnd/src/net/osmand/LogUtil.java index ba170d3d61..8c89ca9c14 100644 --- a/OsmAnd/src/net/osmand/LogUtil.java +++ b/OsmAnd/src/net/osmand/LogUtil.java @@ -22,6 +22,7 @@ import org.xmlpull.v1.XmlPullParserFactory; */ public class LogUtil { public static String TAG = "net.osmand"; //$NON-NLS-1$ + public static boolean AVIAN_LIBRARY = false; private static class OsmandLogImplementation implements Log { private final String fullName; diff --git a/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java b/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java index ceaf76c74a..89ce55a32f 100644 --- a/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java +++ b/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java @@ -33,9 +33,11 @@ public class NativeOsmandLibrary extends NativeLibrary { System.loadLibrary("gnustl_shared"); log.debug("Loading native cpufeatures_proxy..."); //$NON-NLS-1$ System.loadLibrary("cpufeatures_proxy"); -// log.debug("Loading load routing test..."); //$NON-NLS-1$ -// System.loadLibrary("routing_test_jar"); -// testRoutingPing(); + if (LogUtil.AVIAN_LIBRARY) { + log.debug("Loading load routing test..."); //$NON-NLS-1$ + System.loadLibrary("routing_test"); + testRoutingPing(); + } if(android.os.Build.VERSION.SDK_INT >= 8) { log.debug("Loading jnigraphics, since Android >= 2.2 ..."); //$NON-NLS-1$ System.loadLibrary("jnigraphics");