Changeset 5413 for pjproject/trunk/configure-android

Timestamp:

Aug 8, 2016 10:19:15 AM (8 years ago)

Author:

riza

Message:

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

File:

• pjproject/trunk/configure-android (modified) (1 diff)

pjproject/trunk/configure-android

@@ -62 +62 @@
     IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias"
   fi
-
-  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 -f ${ANDROID_NDK_ROOT}/build/ndk-build; then    
+    NDK_BUILD=${ANDROID_NDK_ROOT}/build/ndk-build
+  else 
+    NDK_BUILD=${ANDROID_NDK_ROOT}/ndk-build
+  fi
+
+  NDK_OUT=`${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"