*** a/routerjars/jni/build.sh 2013-10-28 19:34:32.790844250 +0100 --- b/routerjars/jni/build.sh 2013-10-28 19:35:39.906841258 +0100 *************** *** 41,51 **** #export NDK=$(realpath ../../android-ndk-r5b/) ## Simple fix for osx development ! if [ "`uname -s`" == "Darwin" ]; then ! export NDK=/Developer/android/ndk/ ! else ! export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`" ! fi # # API level, must match that in ../AndroidManifest.xml # --- 41,51 ---- #export NDK=$(realpath ../../android-ndk-r5b/) ## Simple fix for osx development ! #if [ "`uname -s`" == "Darwin" ]; then ! # export NDK=/Developer/android/ndk/ ! #else ! # export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`" ! #fi # # API level, must match that in ../AndroidManifest.xml # *************** *** 53,63 **** ARCH=arm export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/ export AABI=arm-linux-androideabi-4.4.3 ! if [ "`uname -s`" == "Darwin" ]; then ! export SYSTEM=darwin-x86 ! else ! export SYSTEM=linux-x86 ! fi export BINPREFIX=arm-linux-androideabi- export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT" # worked without this on 4.3.2, but 5.0.2 couldn't find it --- 53,67 ---- ARCH=arm export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/ export AABI=arm-linux-androideabi-4.4.3 ! if [ "`uname -s`" == "Darwin" ] ! then ! export SYSTEM=darwin-x86 ! elif [ "`uname -m`" == "x86_64" ] ! then ! export SYSTEM=linux-x86_64 ! else ! export SYSTEM=linux-x86 ! fi export BINPREFIX=arm-linux-androideabi- export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT" # worked without this on 4.3.2, but 5.0.2 couldn't find it