diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-08-08 10:19:15 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-08-08 10:19:15 +0000 |
| commit | 3cd6641720bf810a675a255bfdc5dd1906873193 (patch) | |
| tree | 23917ae5c50dadd40ec73b7a7e1c5b84e2d472bf | |
| parent | de5891815932de36675e2f49faef3cbd7b479b96 (diff) | |
Re #1950: Check for ndk-build on configure-android.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5413 74dad513-b988-da41-8d7b-12977e46ad98
| -rwxr-xr-x | configure-android | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure-android b/configure-android index f7942cb6..477b4c3e 100755 --- a/configure-android +++ b/configure-android @@ -61,8 +61,14 @@ if test "$1" = "--use-ndk-cflags"; then if test "x${IGNORE_CFLAGS}" = "x"; then IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias" fi + + 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=`${ANDROID_NDK_ROOT}/ndk-build -n -C pjsip-apps/src/samples/android_sample APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}` + 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" exit 1 |