diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-08-07 23:29:05 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-08-07 23:29:05 +0200 |
| commit | 89fbc2e73b78fb7aaaf3cfbe95185d5f8f1e3cf1 (patch) | |
| tree | 8e8ba4def76bede94806ceee87ea67e92bf115b8 /jni | |
| parent | 98e81a04548eda145c2cabf8d3a7bd24b74b3971 (diff) | |
Fix compiling with Android NDK r9
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 2 | ||||
| -rw-r--r-- | jni/Application.mk | 7 | ||||
| -rw-r--r-- | jni/dummy.cpp | 8 |
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; +} +*/ |