diff --git a/android/gradle.properties b/android/gradle.properties index 084b94b798..b00ed7634d 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ -propMinSdkVersion=9 +propMinSdkVersion=15 propTargetSdkVersion=22 propBuildToolsVersion=22.0.1 propVersionCode=446 diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 65127f7252..b61ee9b49e 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -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 \ diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 0a74ce5e2f..eb90031bf7 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -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. diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index 0adc81f316..e464d88cfa 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -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. diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index 2275f87b06..9401edc4da 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -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