mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Increased minimum Android version to 2.3 (platform-9)

Browse source
This commit is contained in:
Alex Zolotarev 2014-10-28 18:35:24 +03:00 • committed by Alex Zolotarev
parent ff4083d1cc
commit 8c9c502a53
5 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/AndroidManifest.xml
View file

@ -8,7 +8,7 @@
android:sharedUserLabel="@string/shared_user_label">
<uses-sdk
android:minSdkVersion="7"
android:minSdkVersion="9"
tools:overrideLibrary="com.google.android.gms, com.facebook.android"/>
<uses-feature

4
android/gradle.properties
View file

@ -1,4 +1,4 @@
propMinSdkVersion=7
propMinSdkVersion=9
propTargetSdkVersion=21
propBuildToolsVersion=21.0.1
propVersionCode=400
@ -9,4 +9,4 @@ propAndroidSupportLibrary=com.android.support:support-v4:+
propGooglePlayServices=com.google.android.gms:play-services:+
propGradleAndroidPlugin=com.android.tools.build:gradle:0.13.+
propNineOldAndroids=com.nineoldandroids:library:2.4.0
propFacebookSdk=com.facebook.android:facebook-android-sdk:3.19.1
propFacebookSdk=com.facebook.android:facebook-android-sdk:3.19.1

12
android/jni/Android.mk
View file

@ -151,15 +151,7 @@ ifneq ($(NDK_DEBUG),1)
endif
TARGET_PLATFORM := android-5
ifeq ($(TARGET_ARCH_ABI), mips)
TARGET_PLATFORM := android-9
else
ifeq ($(TARGET_ARCH_ABI), x86)
TARGET_PLATFORM := android-9
endif
endif
TARGET_PLATFORM := android-9
LOCAL_HEADER_FILES := \
com/mapswithme/core/jni_helper.hpp \
@ -207,7 +199,7 @@ LOCAL_SRC_FILES := \
nv_event/nv_event.cpp \
nv_time/nv_time.cpp \
LOCAL_LDLIBS := -llog -lGLESv2
LOCAL_LDLIBS := -llog -lGLESv2 -latomic
LOCAL_LDLIBS += -Wl,--gc-sections

2
android/jni/Application.mk
View file

@ -1,5 +1,5 @@
NDK_TOOLCHAIN_VERSION := clang3.5
APP_PLATFORM := android-5
APP_PLATFORM := android-9
APP_STL := c++_static
#APP_CPPFLAGS += -std=c++11
# for gcc 4.6

16
tools/mkspecs/android-clang/qmake.conf
View file

@ -1,17 +1,15 @@
# NDK_ROOT should be defined for qmake
# NDK_HOST should be defined for qmake
# NDK_ABI optionally can be defined to armeabi, armeabi-v7a, mips or x86, by default armeabi will be used
# NDK_PLATFORM should be android-5 or higher
#########################################################################
ANDROID_TARGET_ABI = $$(NDK_ABI)
# by default use armv5 architecture
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi
# by default use armv7 architecture
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
ANDROID_PLATFORM = $$(NDK_PLATFORM)
# by default use android-5 platform
isEmpty( ANDROID_PLATFORM ): ANDROID_PLATFORM = android-5
# Minimum supported version is Android 2.3
ANDROID_PLATFORM = android-9
GCC_VERSION = 4.8
CLANG_VERSION = 3.5
@ -39,9 +37,6 @@ contains(ANDROID_TARGET_ABI, x86) {
GCC_TOOLCHAIN = $$(NDK_ROOT)/toolchains/x86-$$GCC_VERSION/prebuilt/$$(NDK_HOST)
GCC_TARGET = i686-none-linux-android
QMAKE_CFLAGS *= -ffunction-sections -funwind-tables -fstack-protector -fPIC -no-canonical-prefixes -fomit-frame-pointer -fstrict-aliasing
# NOTE: x86 works only from android-9 and above!
contains(ANDROID_PLATFORM, android-5) : ANDROID_PLATFORM = android-9
contains(ANDROID_PLATFORM, android-8) : ANDROID_PLATFORM = android-9
PLATFORM_INCLUDE_PATH = $$(NDK_ROOT)/platforms/$$ANDROID_PLATFORM/arch-x86/usr/include
ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../gabi++/include
@ -55,9 +50,6 @@ contains(ANDROID_TARGET_ABI, x86) {
GCC_TOOLCHAIN = $$(NDK_ROOT)/toolchains/mipsel-linux-android-$$GCC_VERSION/prebuilt/$$(NDK_HOST)
GCC_TARGET = mipsel-none-linux-android
QMAKE_CFLAGS *= -fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0 -no-canonical-prefixes -fomit-frame-pointer
# NOTE: mips works only from android-9 and above!
contains(ANDROID_PLATFORM, android-5) : ANDROID_PLATFORM = android-9
contains(ANDROID_PLATFORM, android-8) : ANDROID_PLATFORM = android-9
PLATFORM_INCLUDE_PATH = $$(NDK_ROOT)/platforms/$$ANDROID_PLATFORM/arch-mips/usr/include
ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../gabi++/include