Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add x86 64

Browse source
This commit is contained in:
Victor Shcherb 2019-10-28 16:44:45 +01:00
parent 903e422383
commit 73c954df5a
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/build.gradle
View file

@ -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" : ""
}

7
OsmAnd/jni/Application.mk
View file

@ -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