From 65f43548dad64019ee65d563f7152cfe239b2b0a Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 23 Sep 2015 09:14:49 -0700 Subject: [PATCH] [android] Switched to clang3.6 --- android/jni/Application.mk | 4 +--- tools/mkspecs/android-clang/qmake.conf | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/android/jni/Application.mk b/android/jni/Application.mk index eb90031bf7..33b00f75b0 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -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 diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index e464d88cfa..fc1772b978 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -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