diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-24 21:31:20 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-24 21:31:20 +0200 |
| commit | c5e4ffc2ecbd6781f7b0ca454391f02f99d0f77e (patch) | |
| tree | 2b59983735efebb6c1c002c7646274630984c171 /jni | |
| parent | 83007ae1abc16de9489431cef599e9d60a518d6a (diff) | |
Build openssl as shared library again, build for all Android ABIs
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 10 | ||||
| -rw-r--r-- | jni/Application.mk | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 3de07059..ee137f81 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,5 +1,6 @@ # Path of the sources + JNI_DIR := $(call my-dir) include lzo/Android.mk @@ -13,19 +14,18 @@ LOCAL_PATH := $(JNI_DIR) # The only real JNI library include $(CLEAR_VARS) -LOCAL_LDLIBS := -llog +LOCAL_LDLIBS := -llog -lz LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp LOCAL_MODULE = opvpnutil -LOCAL_STATIC_LIBRARIES := libcrypto_static +LOCAL_SHARED_LIBRARIES := libcrypto include $(BUILD_SHARED_LIBRARY) - include $(CLEAR_VARS) -LOCAL_LDLIBS := -llog +LOCAL_LDLIBS := -lz +LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn LOCAL_SRC_FILES:= minivpn.c LOCAL_MODULE = minivpn -LOCAL_SHARED_LIBRARIES=openvpn include $(BUILD_EXECUTABLE) diff --git a/jni/Application.mk b/jni/Application.mk index 2000103b..e33410ed 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ -#APP_ABI := armeabi-v7a +APP_ABI := all #APP_PLATFORM := android-14 #APP_OPTIM := release |