From c80929402d872bd95711a2296f78bdcf9cbfdbab Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 29 Aug 2013 21:25:07 +0300 Subject: [PATCH] [android] Revert GCC toolchain to 4.6 (4.8 doesn't work on Android 2.2). --- android/jni/Application.mk | 2 +- tools/mkspecs/android-g++/qmake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/jni/Application.mk b/android/jni/Application.mk index d1d46c2bbb..9cb37e97cc 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,4 +1,4 @@ -NDK_TOOLCHAIN_VERSION := 4.8 +NDK_TOOLCHAIN_VERSION := 4.6 APP_PLATFORM := android-5 ifeq (x$(NDK_ABI_TO_BUILD), x) diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index 3162bc2c31..7c14a33394 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -16,7 +16,7 @@ ANDROID_TARGET_ABI=$$(NDK_ABI) isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi ANDROID_PLATFORM = android-5 -TOOLCHAIN_VERSION = 4.8 +TOOLCHAIN_VERSION = 4.6 contains(ANDROID_TARGET_ABI, x86) { NDK_TOOLCHAIN = x86-$$TOOLCHAIN_VERSION