From 645712490848e6672a55ab05236ce433b5371e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jind=C5=99ich=20Makovi=C4=8Dka?= <makovick@gmail.com>
Date: Sat, 7 Nov 2015 13:30:48 +0100
Subject: [PATCH] Enable x86_64 and arm64-v8a ABIs

---
 OsmAnd/build.gradle       | 12 ++++++++++++
 OsmAnd/jni/Application.mk | 11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 9531d1d5bcd..c9d77fca6f5 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -86,6 +86,12 @@ android {
 	flavorDimensions "version", "coreversion", "abi"
 	productFlavors {
 		// ABI
+		armv8 {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "arm64-v8a"
+			}
+		}
 		armv7 {
 			flavorDimension "abi"
 			ndk {
@@ -104,6 +110,12 @@ android {
 				abiFilter "x86"
 			}
 		}
+		x64 {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "x86_64"
+			}
+		}
 		mips {
 			flavorDimension "abi"
 			ndk {
diff --git a/OsmAnd/jni/Application.mk b/OsmAnd/jni/Application.mk
index bb9ef25fa84..555807c7653 100755
--- a/OsmAnd/jni/Application.mk
+++ b/OsmAnd/jni/Application.mk
@@ -13,17 +13,24 @@ endif
 
 APP_ABI :=
 ifneq ($(filter x86,$(OSMAND_ARCHITECTURES_SET)),)
-    APP_ABI += x86
+    APP_ABI += x86 x86_64
+else
+    ifneq ($(filter x64,$(OSMAND_ARCHITECTURES_SET)),)
+        APP_ABI += x86_64
+    endif
 endif
 ifneq ($(filter mips,$(OSMAND_ARCHITECTURES_SET)),)
     APP_ABI += mips
 endif
 ifneq ($(filter arm,$(OSMAND_ARCHITECTURES_SET)),)
-    APP_ABI += armeabi armeabi-v7a
+    APP_ABI += armeabi armeabi-v7a arm64-v8a
 else
     ifneq ($(filter armv7,$(OSMAND_ARCHITECTURES_SET)),)
         APP_ABI += armeabi-v7a
     endif
+    ifneq ($(filter armv8,$(OSMAND_ARCHITECTURES_SET)),)
+        APP_ABI += arm64-v8a
+    endif
 endif
     
 ifndef OSMAND_DEBUG_NATIVE