Merge pull request #1878 from jmakovicka/enable-64bit

Enable x86_64 and arm64-v8a ABIs
osmandapp · Nov 29, 2015 · e7762cb · e7762cb
2 parents b2b941f + 6457124
commit e7762cb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
@@ -88,6 +88,12 @@ android {
 	flavorDimensions "version", "coreversion", "abi"
 	productFlavors {
 		// ABI
+		armv8 {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "arm64-v8a"
+			}
+		}
 		armv7 {
 			flavorDimension "abi"
 			ndk {
@@ -106,6 +112,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
@@ -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