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

[android] Migrated to NDK r8b. PLEASE UPDATE YOUR NDK AND ADT in Eclipse!

Browse source
This commit is contained in:
Alex Zolotarev 2012-07-19 17:42:05 -07:00 • committed by Alex Zolotarev
parent 78e435a47c
commit a449916857
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,22 +16,23 @@ ANDROID_TARGET_ABI=$$(NDK_ABI)
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi
ANDROID_PLATFORM = android-5
TOOLCHAIN_VERSION = 4.6
contains(ANDROID_TARGET_ABI, x86) {
NDK_TOOLCHAIN = x86-4.4.3
NDK_TOOLCHAIN = x86-$$TOOLCHAIN_VERSION
ANDROID_TARGET_ARCH = x86
ANDROID_CC_PREFIX = i686-android-linux
# NOTE: x86 works only from android-9 and above!
ANDROID_PLATFORM = android-9
} else {
contains(ANDROID_TARGET_ABI, mips) {
NDK_TOOLCHAIN = mipsel-linux-android-4.4.3
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
} else {
NDK_TOOLCHAIN = arm-linux-androideabi-4.4.3
NDK_TOOLCHAIN = arm-linux-androideabi-$$TOOLCHAIN_VERSION
ANDROID_TARGET_ARCH = arm
ANDROID_CC_PREFIX = arm-linux-androideabi
}
@ -43,8 +44,8 @@ CONFIG += $$ANDROID_PLATFORM
ANDROID_PLATFORM_ROOT_PATH = $$(NDK_ROOT)/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_TARGET_ARCH
ANDROID_PLATFORM_PATH = $$ANDROID_PLATFORM_ROOT_PATH/usr
ANDROID_SOURCES_CXX_STL_LIBDIR = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/libs/$$ANDROID_TARGET_ABI
ANDROID_SOURCES_CXX_STL_INCDIR = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/include $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
ANDROID_SOURCES_CXX_STL_LIBDIR = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$$TOOLCHAIN_VERSION/libs/$$ANDROID_TARGET_ABI
ANDROID_SOURCES_CXX_STL_INCDIR = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$$TOOLCHAIN_VERSION/include $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_CC_PREFIX-gcc