4 files changed, 12 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"
diff --git a/pjsip-apps/src/samples/android_sample/jni/Android.mk b/pjsip-apps/src/samples/android_sample/jni/Android.mk
new file mode 100644
index 00000000..87ecd1a6
--- /dev/null
+++ b/pjsip-apps/src/samples/android_sample/jni/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := dummy
+LOCAL_SRC_FILES := dummy.c
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/pjsip-apps/src/samples/android_sample/jni/Application.mk b/pjsip-apps/src/samples/android_sample/jni/Application.mk
new file mode 100644
index 00000000..e619d92f
--- /dev/null
+++ b/pjsip-apps/src/samples/android_sample/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
+\ No newline at end of file
diff --git a/pjsip-apps/src/samples/android_sample/jni/dummy.c b/pjsip-apps/src/samples/android_sample/jni/dummy.c
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/pjsip-apps/src/samples/android_sample/jni/dummy.c