diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-25 19:54:43 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-25 19:54:43 +0200 |
| commit | 575523d46ebf0eb022a58138da998a09d756d493 (patch) | |
| tree | 5db11ecb287d74a2fe6cbc637b59c00c0a02e939 /jni | |
| parent | 2402e4db4da8ced807d061a3fd703ebd0580b92a (diff) | |
| parent | 83dbf0d0df418a51e1f7c1a84ee0b7ae8171ee7e (diff) | |
Merge
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/Application.mk | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index cdfbed8d..3514b920 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,6 +1,4 @@ # Path of the sources - - JNI_DIR := $(call my-dir) include lzo/Android.mk @@ -23,7 +21,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_LDLIBS := -lz -lc +LOCAL_LDLIBS := -lz -lc LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn LOCAL_SRC_FILES:= minivpn.c LOCAL_MODULE = minivpn diff --git a/jni/Application.mk b/jni/Application.mk index e33410ed..38ce95f3 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,5 @@ APP_ABI := all +NDK_TOOLCHAIN_VERSION=4.4.3 #APP_PLATFORM := android-14 #APP_OPTIM := release |