diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-08-05 04:42:48 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-08-05 04:42:48 +0000 |
| commit | 32479fea1f498f051e64570c5280cd77746b14e3 (patch) | |
| tree | 4558296e118dd3de74398138185164d040bc28fa /configure-android | |
| parent | ca00b9934988c6722fbd97239c4ccce721336756 (diff) | |
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
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5409 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'configure-android')
| -rwxr-xr-x | configure-android | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure-android b/configure-android index e1655a4a..f7942cb6 100755 --- a/configure-android +++ b/configure-android @@ -62,7 +62,7 @@ if test "$1" = "--use-ndk-cflags"; then IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias" 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" exit 1 @@ -72,7 +72,7 @@ if test "$1" = "--use-ndk-cflags"; then if test "x${NDK_CXX}" != "x" -a "$i" = "-o"; then break; fi # 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=//'`; fi @@ -80,7 +80,7 @@ if test "$1" = "--use-ndk-cflags"; then fi # 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 NDK_CFLAGS="${NDK_CFLAGS} $i" |