diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 890cf26936..5aa3673cb0 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -138,13 +138,13 @@ android {
 		x86 {
 			dimension "abi"
 			ndk {
-				abiFilter 'x86'
+				abiFilter 'x86', 'x86_64'
 			}
 		}
-		x86_64 {
+		armonly {
 			dimension "abi"
 			ndk {
-				abiFilter 'x86_64'
+				abiFilter 'arm64-v8a', 'armeabi-v7a'
 			}
 		}
 		fat {
@@ -394,6 +394,9 @@ task buildOsmAndCore(type: Exec) {
 		if(tskReqStr.contains("armv7")) {
 			flavour = flavour.length() == 0 ? "ARMV7_ONLY" : ""
 		}
+		if(tskReqStr.contains("armonly")) {
+			flavour = flavour.length() == 0 ? "ARM_ONLY" : ""
+		}
 		if(tskReqStr.contains("x86")) {
 			flavour = flavour.length() == 0 ? "X86_ONLY" : ""
 		}
diff --git a/OsmAnd/jni/Application.mk b/OsmAnd/jni/Application.mk
index 46d5d2204d..58633d3223 100755
--- a/OsmAnd/jni/Application.mk
+++ b/OsmAnd/jni/Application.mk
@@ -6,7 +6,10 @@ APP_SHORT_COMMANDS := true
 APP_PLATFORM := android-14
 
 NDK_TOOLCHAIN_VERSION := clang
-APP_ABI := x86 armeabi-v7a arm64-v8a
+APP_ABI := x86 armeabi-v7a arm64-v8a x86_64
+ifdef ARM_ONLY
+    APP_ABI := armeabi-v7a arm64-v8a
+endif 
 ifdef ARMV7_ONLY
     APP_ABI := armeabi-v7a
 endif 
@@ -14,7 +17,7 @@ ifdef ARM64_ONLY
     APP_ABI := arm64-v8a
 endif
 ifdef X86_ONLY
-    APP_ABI := x86
+    APP_ABI := x86 x86_64
 endif
 
 # APP_ABI := armeabi-v7a