diff options
| author | Alex Zolotarev <alex@maps.me> | 2016-04-01 18:58:58 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2016-04-08 15:33:33 +0300 |
| commit | 5659b31e94cb50c0ec6a5c117faf60395afdcba0 (patch) | |
| tree | 7362c3ec4884cde23ef6f273dca3eaa9f4b0eee3 /tools/mkspecs | |
| parent | 0d95d2dc78837a4abfd1b957e6339fad89b7b44d (diff) | |
[android] Upgrade to NDK r11b.
Diffstat (limited to 'tools/mkspecs')
| -rw-r--r-- | tools/mkspecs/android-clang/qmake.conf | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index fc1772b978..6c498513b6 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -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 |