Changeset 5409

Timestamp:

Aug 5, 2016 4:42:48 AM (8 years ago)

Author:

ming

Message:

Fixed #1950: Failure in configure-android when specifying --use-ndk-cflags with Android NDK r11 or later

• Create our own dummy (empty) Android sample app
• Unspecify the toolchain version and use default instead

Location:

pjproject/trunk

Files:

• configure-android (modified) (3 diffs)
• pjsip-apps/src/samples/android_sample (added)
• pjsip-apps/src/samples/android_sample/jni (added)
• pjsip-apps/src/samples/android_sample/jni/Android.mk (added)
• pjsip-apps/src/samples/android_sample/jni/Application.mk (added)
• pjsip-apps/src/samples/android_sample/jni/dummy.c (added)

pjproject/trunk/configure-android

@@ -63 +63 @@
   fi
 
-  NDK_OUT=`${ANDROID_NDK_ROOT}/ndk-build -n -C ${ANDROID_NDK_ROOT}/samples/hello-jni NDK_TOOLCHAIN_VERSION=4.8 APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`
+  NDK_OUT=`${ANDROID_NDK_ROOT}/ndk-build -n -C pjsip-apps/src/samples/android_sample APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`
   if test ! "${NDK_OUT}"; then
     echo "$F error: failed to run ndk-build, check ANDROID_NDK_ROOT env var"
@@ -73 +73 @@
 
     # Parse NDK CXXFLAGS
-    if test "x${NDK_CXX}" != "x" -a "x`echo $i|grep 'hello-jni'`" = "x"; then
+    if test "x${NDK_CXX}" != "x" -a "x`echo $i|grep 'dummy'`" = "x"; then
       if test "x`echo $i|grep '\-\-sysroot='`" != "x"; then
         ANDROID_SYSROOT=`echo $i|sed 's/--sysroot=//'`;
@@ -81 +81 @@
 
     # Parse NDK CFLAGS
-    if test "x${NDK_CC}" != "x" -a "x`echo $i|grep 'hello-jni'`" = "x" -a "${ADD_CFLAGS}" = "1"; then
+    if test "x${NDK_CC}" != "x" -a "x`echo $i|grep 'dummy'`" = "x" -a "${ADD_CFLAGS}" = "1"; then
       if test "$i" = "-c"; then ADD_CFLAGS="0"; else
         if test "x`echo $i|grep ${IGNORE_CFLAGS}`" = "x"; then