updated pjsip stack
There is still a bug on incoming calls when buiding for android
diff --git a/jni/pjproject-android/configure-iphone b/jni/pjproject-android/configure-iphone
index 79bf226..dfe548e 100755
--- a/jni/pjproject-android/configure-iphone
+++ b/jni/pjproject-android/configure-iphone
@@ -18,7 +18,7 @@
echo " to use. By default, the compiler is deduced from the"
echo " SDK."
echo " ARCH Optional flags to specify target architecture, e.g."
- echo " ARCH='-arch armv6'"
+ echo " ARCH='-arch armv6'. Default is armv7."
echo ""
exit 0
fi
@@ -70,19 +70,24 @@
LDFLAGS="-O2"
fi
+# Test the toolchain directory
+TCPATH="${DEVPATH}/../../../Toolchains/XcodeDefault.xctoolchain"
+if test ! -d ${TCPATH}/usr/bin; then
+ TCPATH="${DEVPATH}"
+fi
+
# Determine which gcc for this SDK. Binaries should have the
# full path as it's not normally in user's PATH
if test "${CC}" = ""; then
- # Try to use llvm-gcc if available
+ # Try to use clang if available
+ ccpath="${TCPATH}/usr/bin/clang"
+ # Next, try to use llvm-gcc
gccpath="${DEVPATH}/usr/bin/llvm-gcc"
- if test -e ${gccpath}; then
+ if test -e ${ccpath}; then
+ export CC="${ccpath}"
+ elif test -e ${gccpath}; then
export CC="${gccpath}"
-
- if test "${ARCH}" = ""; then
- export ARCH="-arch armv7"
- echo "$F: ARCH is not specified, choosing ${ARCH}"
- fi
else
for archpath in `ls -d ${SDKPATH}/usr/lib/gcc/arm-apple-darwin*`; do
archname=`basename ${archpath}`
@@ -104,6 +109,11 @@
exit 1
fi
+if test "${ARCH}" = ""; then
+ export ARCH="-arch armv7"
+ echo "$F: ARCH is not specified, choosing ${ARCH}"
+fi
+
# Set CXX if not set
if test "${CXX}" = ""; then
export CXX=`echo ${CC} | sed 's/gcc/g++/'`
@@ -114,7 +124,7 @@
#ARCH="-arch armv6"
export CFLAGS="${CFLAGS} -DPJ_SDK_NAME=\"\\\"`basename $SDKPATH`\\\"\" ${ARCH} -isysroot ${SDKPATH}"
export LDFLAGS="${LDFLAGS} ${ARCH} -isysroot ${SDKPATH} -framework AudioToolbox -framework Foundation"
-export AR="${DEVPATH}/usr/bin/libtool -static -o"
+export AR="${TCPATH}/usr/bin/libtool -static -o"
export RANLIB="echo ranlib"
# Use gcc -E as preprocessor instead of cpp, since cpp will find the
# header files in standard /usr/include instead of in isysroot