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

[android] NDK r10e support. Everyone should update NDK after merge.

Browse source
This commit is contained in:
Alex Zolotarev 2015-05-18 14:14:24 +03:00
parent 96cef762f1
commit 1a3a643bce
2 changed files with 5 additions and 5 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.5
NDK_TOOLCHAIN_VERSION := clang3.6
APP_PLATFORM := android-9
APP_STL := c++_static

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

@ -8,11 +8,11 @@ ANDROID_TARGET_ABI = $$(NDK_ABI)
# by default use armv7 architecture
isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
# Minimum supported version is Android 2.3
# Minimum supported platform is Android 2.3
ANDROID_PLATFORM = android-9
GCC_VERSION = 4.8
CLANG_VERSION = 3.5
CLANG_VERSION = 3.6
MAKEFILE_GENERATOR = UNIX
QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang
@ -36,7 +36,7 @@ contains(ANDROID_TARGET_ABI, x86) {
# x86 toolchain
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
QMAKE_CFLAGS *= -ffunction-sections -funwind-tables -fstack-protector-strong -fPIC -no-canonical-prefixes -fomit-frame-pointer -fstrict-aliasing
PLATFORM_INCLUDE_PATH = $$(NDK_ROOT)/platforms/$$ANDROID_PLATFORM/arch-x86/usr/include
ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../gabi++/include
@ -59,7 +59,7 @@ contains(ANDROID_TARGET_ABI, x86) {
} else {
# armeabi or armeabi-v7a or armeabi-v7a-hard toolchains
GCC_TOOLCHAIN = $$(NDK_ROOT)/toolchains/arm-linux-androideabi-$$GCC_VERSION/prebuilt/$$(NDK_HOST)
QMAKE_CFLAGS *= -fpic -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -mthumb -fomit-frame-pointer -fno-strict-aliasing
QMAKE_CFLAGS *= -fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mthumb -fomit-frame-pointer -fno-strict-aliasing -fno-integrated-as
PLATFORM_INCLUDE_PATH = $$(NDK_ROOT)/platforms/$$ANDROID_PLATFORM/arch-arm/usr/include
ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../llvm-libc++abi/libcxxabi/include