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

[android] Revert GCC toolchain to 4.6 (4.8 doesn't work on Android 2.2).

Browse source
This commit is contained in:
vng 2013-08-29 21:25:07 +03:00 • committed by Alex Zolotarev
parent 7e4eac4f83
commit c80929402d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/Application.mk
View file

@ -1,4 +1,4 @@
NDK_TOOLCHAIN_VERSION := 4.8
NDK_TOOLCHAIN_VERSION := 4.6
APP_PLATFORM := android-5
ifeq (x$(NDK_ABI_TO_BUILD), x)

2
tools/mkspecs/android-g++/qmake.conf
View file

@ -16,7 +16,7 @@ ANDROID_TARGET_ABI=$$(NDK_ABI)
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi
ANDROID_PLATFORM = android-5
TOOLCHAIN_VERSION = 4.8
TOOLCHAIN_VERSION = 4.6
contains(ANDROID_TARGET_ABI, x86) {
NDK_TOOLCHAIN = x86-$$TOOLCHAIN_VERSION