summaryrefslogtreecommitdiff
path: root/jni
diff options
context:
space:
mode:
Diffstat (limited to 'jni')
-rw-r--r--jni/Android.mk2
-rw-r--r--jni/Application.mk7
-rw-r--r--jni/dummy.cpp8
3 files changed, 13 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index ab989813..58cfa757 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -36,7 +36,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_LDLIBS := -lz -lc
LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn
-LOCAL_SRC_FILES:= minivpn.c
+LOCAL_SRC_FILES:= minivpn.c dummy.cpp
LOCAL_MODULE = minivpn
include $(BUILD_EXECUTABLE)
diff --git a/jni/Application.mk b/jni/Application.mk
index 5670b6e3..b69669ac 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,7 +1,8 @@
APP_ABI := all
-NDK_TOOLCHAIN_VERSION=4.4.3
-#APP_PLATFORM := android-14
-APP_STL:=stlport_static
+APP_PLATFORM := android-14
+
+APP_STL:=stlport_shared
+#APP_STL:=gnustl_shared
#APP_OPTIM := release
diff --git a/jni/dummy.cpp b/jni/dummy.cpp
new file mode 100644
index 00000000..58466656
--- /dev/null
+++ b/jni/dummy.cpp
@@ -0,0 +1,8 @@
+/*#include <string>
+#include <iostream>
+
+void dummy()
+{
+ std::cout << "I am a dummy function to help compile on Android NDK r9" << std::endl;
+}
+*/