Changeset 4569

Timestamp:

Jul 19, 2013 10:08:24 AM (11 years ago)

Author:

ming

Message:

JNI projects:

• Modify configure-android to autodetect gcc version and build machine

Location:

pjproject/branches/projects/jni

Files:

• configure-android (modified) (1 diff)
• pjsip-apps/src/jni/Makefile (added)
• pjsip-apps/src/jni/my_typemaps.i (deleted)
• pjsip-apps/src/jni/swig_gen.py (deleted)

pjproject/branches/projects/jni/configure-android

@@ -66 +66 @@
 fi
 
-HOST_OS=$(uname -s)
-case $HOST_OS in
-  Darwin) BUILD_MACHINE="darwin-x86";;
-  Linux) BUILD_MACHINE="linux-x86";;
-  CYGWIN*|*_NT-*) BUILD_MACHINE="windows";;
-esac
-
-ANDROID_TC="${ANDROID_NDK_ROOT}/toolchains/${TC_DIR}-4.4.3/prebuilt/${BUILD_MACHINE}"
+ANDROID_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/toolchains/${TC_DIR}-* | sed 's/clang/0/' | sort -gr | head -1`
+ANDROID_TC=`ls -d ${ANDROID_TC_VER}/prebuilt/*`
 if test ! -d ${ANDROID_TC}; then
   echo "$F error: unable to find directory ${ANDROID_TC} in Android NDK"