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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-11-30 10:22:00 +01:00
commit d50144a84b
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/build.gradle
View file

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

11
OsmAnd/jni/Application.mk
View file

@ -13,24 +13,17 @@ endif
APP_ABI := APP_ABI :=
ifneq ($(filter x86,$(OSMAND_ARCHITECTURES_SET)),) ifneq ($(filter x86,$(OSMAND_ARCHITECTURES_SET)),)
APP_ABI += x86 x86_64 APP_ABI += x86
else
ifneq ($(filter x64,$(OSMAND_ARCHITECTURES_SET)),)
APP_ABI += x86_64
endif
endif endif
ifneq ($(filter mips,$(OSMAND_ARCHITECTURES_SET)),) ifneq ($(filter mips,$(OSMAND_ARCHITECTURES_SET)),)
APP_ABI += mips APP_ABI += mips
endif endif
ifneq ($(filter arm,$(OSMAND_ARCHITECTURES_SET)),) ifneq ($(filter arm,$(OSMAND_ARCHITECTURES_SET)),)
APP_ABI += armeabi armeabi-v7a arm64-v8a APP_ABI += armeabi armeabi-v7a
else else
ifneq ($(filter armv7,$(OSMAND_ARCHITECTURES_SET)),) ifneq ($(filter armv7,$(OSMAND_ARCHITECTURES_SET)),)
APP_ABI += armeabi-v7a APP_ABI += armeabi-v7a
endif endif
ifneq ($(filter armv8,$(OSMAND_ARCHITECTURES_SET)),)
APP_ABI += arm64-v8a
endif
endif endif
ifndef OSMAND_DEBUG_NATIVE ifndef OSMAND_DEBUG_NATIVE