From b66c6af24f30dcd7d1fcdc8f7ef66311b26f23af Mon Sep 17 00:00:00 2001 From: pancake Date: Sun, 12 Apr 2015 15:46:37 +0200 Subject: [PATCH] Rollback the NDK for arm,mips,x86 to kitkat, keep lolipop for arm64 --- sys/ndk-gcc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/ndk-gcc b/sys/ndk-gcc index bf458fd9c0..678cdf2115 100755 --- a/sys/ndk-gcc +++ b/sys/ndk-gcc @@ -13,22 +13,25 @@ fi PROGDIR=`dirname $0` PROGDIR=`cd $PROGDIR && pwd` +ANDROID_KITKAT=19 +ANDROID_LOLIPOP=21 + OS=`uname | tr 'A-Z' 'a-z'` [ "${OS}" = macos ] && OS=darwin ARCH2=${ARCH} case "${ARCH}" in aarch64) - ANDROID_SDK_VERSION=21 + ANDROID_SDK_VERSION=${ANDROID_LOLIPOP} NDKPFX=${ARCH}-linux-android ARCH2=arm64 ;; arm) - ANDROID_SDK_VERSION=21 + ANDROID_SDK_VERSION=${ANDROID_KITKAT} NDKPFX=${ARCH}-linux-androideabi ;; mips) - ANDROID_SDK_VERSION=21 #mips + ANDROID_SDK_VERSION=${ANDROID_KITKAT} #mips NDKPFX=mipsel-linux-android ${NDKPFX}-gcc 2>/dev/null if [ $? -gt 1 ]; then @@ -36,7 +39,7 @@ mips) fi ;; mips64) - ANDROID_SDK_VERSION=21 #mips64 + ANDROID_SDK_VERSION=${ANDROID_KITKAT} #mips64 NDKPFX=mips64el-linux-android ${NDKPFX}-gcc 2>/dev/null if [ $? -gt 1 ]; then @@ -44,7 +47,7 @@ mips64) fi ;; x86) - ANDROID_SDK_VERSION=21 #x86 + ANDROID_SDK_VERSION=${ANDROID_KITKAT} #x86 NDKPFX=i686-android-linux ${NDKPFX}-gcc 2>/dev/null if [ $? -gt 1 ]; then