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

[android] Upgrade to NDK r11b.

Browse source
This commit is contained in:
Alex Zolotarev 2016-04-01 18:58:58 +03:00
parent 0d95d2dc78
commit 5659b31e94
2 changed files with 10 additions and 11 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 := clang3.6
NDK_TOOLCHAIN_VERSION := clang
APP_PLATFORM := android-15
APP_STL := c++_static

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

@ -1,23 +1,22 @@
# 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_ROOT should be defined for qmake.
# NDK_HOST should be defined for qmake.
# NDK_ABI optionally can be defined to any abi supported by NDK.
#########################################################################
ANDROID_TARGET_ABI = $$(NDK_ABI)
# by default use armv7 architecture
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
# By default use armv7 architecture with hardware math co-processor.
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a-hard
# Minimum supported platform is Android 4.0.3
# Minimum supported platform is Android 4.0.3.
ANDROID_PLATFORM = android-15
GCC_VERSION = 4.8
CLANG_VERSION = 3.6
GCC_VERSION = 4.9
MAKEFILE_GENERATOR = UNIX
QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang
QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm/prebuilt/$$(NDK_HOST)/bin/clang
QMAKE_CC = $$QMAKE_COMPILER
QMAKE_CXX = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang++
QMAKE_CXX = $$(NDK_ROOT)/toolchains/llvm/prebuilt/$$(NDK_HOST)/bin/clang++
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
QMAKE_LINK = $$QMAKE_CXX