diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-15 16:16:57 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-15 16:16:57 +0200 |
| commit | 3ab9e38d4473a7a34b820d80cc442ba6c3e30564 (patch) | |
| tree | a2390c60dd00cda81c86f18fd4f29103124dc17e /jni/Android.mk | |
| parent | 77583ce01023073fec1cbce468c05b6e44097aa0 (diff) | |
Add support for Certificates from Keystore under Jelly Beans (Thanks Kenny Root for the right pointers)
Move jniglue/minivpn files to more sensitive places
--HG--
rename : openvpn/src/openvpn/jniglue.c => jni/jniglue.c
rename : openvpn/src/openvpn/jniglue.h => jni/jniglue.h
rename : openvpn/src/openvpn/testmain.c => jni/minivpn.c
Diffstat (limited to 'jni/Android.mk')
| -rw-r--r-- | jni/Android.mk | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index ff17b27b..761fa005 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,9 +1,31 @@ # Path of the sources -CURRENT_DIR := $(call my-dir) +JNI_DIR := $(call my-dir) include lzo/Android.mk include openssl/Android.mk include openvpn/Android.mk + + +LOCAL_PATH := $(JNI_DIR) + +# The only real JNI library +include $(CLEAR_VARS) +LOCAL_LDLIBS := -llog +LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl +LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp +LOCAL_MODULE = opvpnutil +LOCAL_STATIC_LIBRARIES := libcrypto_static +include $(BUILD_SHARED_LIBRARY) + + + +include $(CLEAR_VARS) +LOCAL_LDLIBS := -llog +LOCAL_SRC_FILES:= minivpn.c +LOCAL_MODULE = minivp +LOCAL_SHARED_LIBRARIES=openvpn +include $(BUILD_EXECUTABLE) + |