diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-10-28 18:35:24 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:31:51 +0300 |
| commit | 8c9c502a5345d3e0f33c4c3527faf56c88029116 (patch) | |
| tree | 532f6f35d3c7deac9a4985639fcb8c8d0626cb9a /android | |
| parent | ff4083d1cc95704720a38504f2ee4f3300b194a3 (diff) | |
[android] Increased minimum Android version to 2.3 (platform-9)
Diffstat (limited to 'android')
| -rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/gradle.properties | 4 | ||||
| -rw-r--r-- | android/jni/Android.mk | 12 | ||||
| -rw-r--r-- | android/jni/Application.mk | 2 |
4 files changed, 6 insertions, 14 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index bdbfc51b41..9bd2612010 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -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 diff --git a/android/gradle.properties b/android/gradle.properties index e939b8fc3c..48cfc92817 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -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
\ No newline at end of file +propFacebookSdk=com.facebook.android:facebook-android-sdk:3.19.1 diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 15deb14903..4475659b2e 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -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 diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 08172e0ef7..c005bcf363 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -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 |