forked from organicmaps/organicmaps
[android] fix: Minimum supported Android version raised to 4.0.3 (API15).
This commit is contained in:
parent
9bcd7f739f
commit
30974e0d83
5 changed files with 7 additions and 7 deletions
|
@ -1,4 +1,4 @@
|
|||
propMinSdkVersion=9
|
||||
propMinSdkVersion=15
|
||||
propTargetSdkVersion=22
|
||||
propBuildToolsVersion=22.0.1
|
||||
propVersionCode=446
|
||||
|
|
|
@ -54,7 +54,7 @@ ifneq ($(NDK_DEBUG),1)
|
|||
endif
|
||||
|
||||
|
||||
TARGET_PLATFORM := android-9
|
||||
TARGET_PLATFORM := android-15
|
||||
|
||||
LOCAL_HEADER_FILES := \
|
||||
com/mapswithme/core/jni_helper.hpp \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# We can't use clang3.6 for now because it hangs at base/normalize_unicode.cpp compilation.
|
||||
# TODO: Replace normalize_unicode.cpp with equal by performance implementation (ask YuraRa about it).
|
||||
NDK_TOOLCHAIN_VERSION := clang3.5
|
||||
APP_PLATFORM := android-9
|
||||
APP_PLATFORM := android-15
|
||||
APP_STL := c++_static
|
||||
|
||||
# libc++-specific issues: -std=c++11" is turned on by default.
|
||||
|
|
|
@ -8,8 +8,8 @@ ANDROID_TARGET_ABI = $$(NDK_ABI)
|
|||
# by default use armv7 architecture
|
||||
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
|
||||
|
||||
# Minimum supported platform is Android 2.3
|
||||
ANDROID_PLATFORM = android-9
|
||||
# Minimum supported platform is Android 4.0.3
|
||||
ANDROID_PLATFORM = android-15
|
||||
|
||||
GCC_VERSION = 4.8
|
||||
# We can't use clang3.6 for now because it hangs at base/normalize_unicode.cpp compilation.
|
||||
|
|
|
@ -26,14 +26,14 @@ contains(ANDROID_TARGET_ABI, x86) {
|
|||
ANDROID_TARGET_ARCH = x86
|
||||
ANDROID_CC_PREFIX = i686-linux-android
|
||||
# NOTE: x86 works only from android-9 and above!
|
||||
ANDROID_PLATFORM = android-9
|
||||
ANDROID_PLATFORM = android-15
|
||||
} else {
|
||||
contains(ANDROID_TARGET_ABI, mips) {
|
||||
NDK_TOOLCHAIN = mipsel-linux-android-$$TOOLCHAIN_VERSION
|
||||
ANDROID_TARGET_ARCH = mips
|
||||
ANDROID_CC_PREFIX = mipsel-linux-android
|
||||
# NOTE: mips works only from android-9 and above!
|
||||
ANDROID_PLATFORM = android-9
|
||||
ANDROID_PLATFORM = android-15
|
||||
} else {
|
||||
NDK_TOOLCHAIN = arm-linux-androideabi-$$TOOLCHAIN_VERSION
|
||||
ANDROID_TARGET_ARCH = arm
|
||||
|
|
Loading…
Add table
Reference in a new issue