Merge pull request #2003 from osmandapp/revert-1878-enable-64bit

Revert "Enable x86_64 and arm64-v8a ABIs"

OsmAnd/build.gradle

@@ -88,12 +88,6 @@ android {
 	flavorDimensions "version", "coreversion", "abi"
 	productFlavors {
 		// ABI
-		armv8 {
-			flavorDimension "abi"
-			ndk {
-				abiFilter "arm64-v8a"
-			}
-		}
 		armv7 {
 			flavorDimension "abi"
 			ndk {
@@ -112,12 +106,6 @@ android {
 				abiFilter "x86"
 			}
 		}
-		x64 {
-			flavorDimension "abi"
-			ndk {
-				abiFilter "x86_64"
-			}
-		}
 		mips {
 			flavorDimension "abi"
 			ndk {

OsmAnd/jni/Application.mk

@@ -13,24 +13,17 @@ endif
 
 APP_ABI :=
 ifneq ($(filter x86,$(OSMAND_ARCHITECTURES_SET)),)
-    APP_ABI += x86 x86_64
-else
-    ifneq ($(filter x64,$(OSMAND_ARCHITECTURES_SET)),)
-        APP_ABI += x86_64
-    endif
+    APP_ABI += x86
 endif
 ifneq ($(filter mips,$(OSMAND_ARCHITECTURES_SET)),)
     APP_ABI += mips
 endif
 ifneq ($(filter arm,$(OSMAND_ARCHITECTURES_SET)),)
-    APP_ABI += armeabi armeabi-v7a arm64-v8a
+    APP_ABI += armeabi armeabi-v7a
 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