kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #11 from deathbaba/android-clang-3.6

Browse source 
[android] Switched to clang3.6.
This commit is contained in:
Dmitry Yunitsky 2015-09-23 19:20:16 +03:00
commit b69fb417c3
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/Application.mk
View file

@ -1,6 +1,4 @@
# We can't use clang3.6 for now because it hangs at base/normalize_unicode.cpp compilation.
# TODO: Replace normalize_unicode.cpp with equal by performance implementation (ask YuraRa about it).
NDK_TOOLCHAIN_VERSION := clang3.5
NDK_TOOLCHAIN_VERSION := clang3.6
APP_PLATFORM := android-15
APP_STL := c++_static

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

@ -12,9 +12,7 @@ isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
ANDROID_PLATFORM = android-15
GCC_VERSION = 4.8
# We can't use clang3.6 for now because it hangs at base/normalize_unicode.cpp compilation.
# TODO: Replace normalize_unicode.cpp with equal by performance implementation (ask YuraRa about it).
CLANG_VERSION = 3.5
CLANG_VERSION = 3.6
MAKEFILE_GENERATOR = UNIX
QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang