Changeset 5409


Ignore:
Timestamp:
Aug 5, 2016 4:42:48 AM (3 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:
5 added
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-android

    r5389 r5409  
    6363  fi 
    6464 
    65   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}` 
     65  NDK_OUT=`${ANDROID_NDK_ROOT}/ndk-build -n -C pjsip-apps/src/samples/android_sample APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}` 
    6666  if test ! "${NDK_OUT}"; then 
    6767    echo "$F error: failed to run ndk-build, check ANDROID_NDK_ROOT env var" 
     
    7373 
    7474    # Parse NDK CXXFLAGS 
    75     if test "x${NDK_CXX}" != "x" -a "x`echo $i|grep 'hello-jni'`" = "x"; then 
     75    if test "x${NDK_CXX}" != "x" -a "x`echo $i|grep 'dummy'`" = "x"; then 
    7676      if test "x`echo $i|grep '\-\-sysroot='`" != "x"; then 
    7777        ANDROID_SYSROOT=`echo $i|sed 's/--sysroot=//'`; 
     
    8181 
    8282    # Parse NDK CFLAGS 
    83     if test "x${NDK_CC}" != "x" -a "x`echo $i|grep 'hello-jni'`" = "x" -a "${ADD_CFLAGS}" = "1"; then 
     83    if test "x${NDK_CC}" != "x" -a "x`echo $i|grep 'dummy'`" = "x" -a "${ADD_CFLAGS}" = "1"; then 
    8484      if test "$i" = "-c"; then ADD_CFLAGS="0"; else 
    8585        if test "x`echo $i|grep ${IGNORE_CFLAGS}`" = "x"; then 
Note: See TracChangeset for help on using the changeset viewer.