Ignore:
Timestamp:
Aug 8, 2016 10:19:15 AM (8 years ago)
Author:
riza
Message:

Re #1950: Check for ndk-build on configure-android.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-android

    r5409 r5413  
    6262    IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias" 
    6363  fi 
    64  
    65   NDK_OUT=`${ANDROID_NDK_ROOT}/ndk-build -n -C pjsip-apps/src/samples/android_sample APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}` 
     64   
     65  if test -f ${ANDROID_NDK_ROOT}/build/ndk-build; then     
     66    NDK_BUILD=${ANDROID_NDK_ROOT}/build/ndk-build 
     67  else  
     68    NDK_BUILD=${ANDROID_NDK_ROOT}/ndk-build 
     69  fi 
     70 
     71  NDK_OUT=`${NDK_BUILD} -n -C pjsip-apps/src/samples/android_sample APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}` 
    6672  if test ! "${NDK_OUT}"; then 
    6773    echo "$F error: failed to run ndk-build, check ANDROID_NDK_ROOT env var" 
Note: See TracChangeset for help on using the changeset viewer.