diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2012-07-18 09:28:18 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:41:07 +0300 |
| commit | f58ab8cd768e1e1da222ad5c7158b3d36ab47f65 (patch) | |
| tree | 40f21d3467150a8a742425ae8f45f2e5fa814e80 /tools | |
| parent | e2223eca7ada4a6e4289aa832565e94ed52049e0 (diff) | |
[android] Fixed build platform
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkspecs/android-g++/qmake.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index 30b63fd55a..1711735e69 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -15,15 +15,21 @@ ANDROID_TARGET_ABI=$$(NDK_ABI) # by default use armv5 architecture isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi +ANDROID_PLATFORM = android-5 + contains(ANDROID_TARGET_ABI, x86) { NDK_TOOLCHAIN = x86-4.4.3 ANDROID_TARGET_ARCH = x86 ANDROID_CC_PREFIX = i686-android-linux + # NOTE: x86 works only from android-9 and above! + ANDROID_PLATFORM = android-9 } else { contains(ANDROID_TARGET_ABI, mips) { NDK_TOOLCHAIN = mipsel-linux-android-4.4.3 ANDROID_TARGET_ARCH = mips ANDROID_CC_PREFIX = mipsel-linux-android + # NOTE: mips works only from android-9 and above! + ANDROID_PLATFORM = android-9 } else { NDK_TOOLCHAIN = arm-linux-androideabi-4.4.3 ANDROID_TARGET_ARCH = arm @@ -31,9 +37,6 @@ contains(ANDROID_TARGET_ABI, x86) { } } -# NOTE: x86 works only from android-9 and above! -ANDROID_PLATFORM = android-9 - NDK_TOOLCHAIN_PATH=$$(NDK_ROOT)/toolchains/$$NDK_TOOLCHAIN/prebuilt/$$(NDK_HOST) CONFIG += $$ANDROID_PLATFORM |