From 89fbc2e73b78fb7aaaf3cfbe95185d5f8f1e3cf1 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 7 Aug 2013 23:29:05 +0200
Subject: Fix compiling with Android NDK r9

---
 jni/Android.mk     | 2 +-
 jni/Application.mk | 7 ++++---
 jni/dummy.cpp      | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 jni/dummy.cpp

(limited to 'jni')

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;
+}
+*/
-- 
cgit v1.2.3