From 42e8c8ce720aec5c31971827f9e45891a33205f4 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 23 Jul 2018 21:27:36 +0200
Subject: [PATCH] udpate default version

---
 OsmAnd-java/collect_legacy_libs.sh                      | 2 +-
 OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-java/collect_legacy_libs.sh b/OsmAnd-java/collect_legacy_libs.sh
index 851158199d..54172a2cd9 100755
--- a/OsmAnd-java/collect_legacy_libs.sh
+++ b/OsmAnd-java/collect_legacy_libs.sh
@@ -29,4 +29,4 @@ function compile {
 
 compile
 copyLibs linux amd64 amd64 so
-# copyLibs linux i686 x86 so
+copyLibs linux i686 x86 so
diff --git a/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
index 3e04d96eae..bce63b5cee 100644
--- a/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
+++ b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
@@ -259,7 +259,7 @@ public class NativeLibrary {
 		if (osname.startsWith("sunos"))
 			osname = "solaris";
 		if (osarch.startsWith("i") && osarch.endsWith("86"))
-			osarch = "amd64";
+			osarch = "x86";
 		String libname = libBaseName + "-" + osname + '-' + osarch + ".lib";
 
 		// try a bundled library