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

[android] Reverted back to clang 3.5 as normalize_unicode compiles too long in release mode with -O3

Browse source
This commit is contained in:
Alex Zolotarev 2015-05-19 14:05:39 +03:00
parent dc7f47d332
commit 4ae62648f3
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/Application.mk
View file

@ -1,4 +1,6 @@
NDK_TOOLCHAIN_VERSION := clang3.6
# 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
APP_PLATFORM := android-9
APP_STL := c++_static

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

@ -12,7 +12,9 @@ isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
ANDROID_PLATFORM = android-9
GCC_VERSION = 4.8
CLANG_VERSION = 3.6
# 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
MAKEFILE_GENERATOR = UNIX
QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang