diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
| commit | d09435a9d2adb0d0cafa0b1f9f6cfe326346cbc6 (patch) | |
| tree | 946278cd836aa6af639675f4eb5ec7378d783dd8 /app/jni/Android.mk | |
| parent | 5d47fde84a03acb1201f8650c55dc0cd981df679 (diff) | |
| parent | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (diff) | |
Merge branch 'develop' into release-0.5.2
Diffstat (limited to 'app/jni/Android.mk')
| -rw-r--r-- | app/jni/Android.mk | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk index 3514b920..a3280bd6 100644 --- a/app/jni/Android.mk +++ b/app/jni/Android.mk @@ -1,12 +1,45 @@ # Path of the sources JNI_DIR := $(call my-dir) +#optional arguments +#WITH_POLAR=1 +#WITH_OPENVPN3=1 +# Build openvpn with polar (OpenVPN3 core is always build with polar) +USE_BREAKPAD=0 +WITH_BREAKPAD=0 + include lzo/Android.mk +include snappy/Android.mk include openssl/Android.mk +ifneq ($(USE_BREAKPAD),0) + ifneq ($(TARGET_ARCH),mips) + WITH_BREAKPAD=1 +# include google-breakpad/android/google_breakpad/Android.mk + else + WITH_BREAKPAD=0 + endif +else +WITH_BREAKPAD=0 +endif + +ifeq ($(WITH_POLAR),1) + USE_POLAR=1 +endif +ifeq ($(WITH_OPENVPN3),1) + USE_POLAR=1 +endif + +ifeq ($(USE_POLAR),1) + include polarssl/Android.mk +endif + include openvpn/Android.mk +ifeq ($(WITH_OPENVPN3),1) + include ovpn3/Android.mk +endif LOCAL_PATH := $(JNI_DIR) @@ -23,7 +56,18 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -lc LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn -LOCAL_SRC_FILES:= minivpn.c -LOCAL_MODULE = minivpn +LOCAL_SRC_FILES:= minivpn.c dummy.cpp +LOCAL_MODULE = nopievpn +include $(BUILD_EXECUTABLE) + + +include $(CLEAR_VARS) +LOCAL_LDLIBS := -lz -lc +LOCAL_CFLAGS= -fPIE -pie +LOCAL_CFLAGS = -fPIE +LOCAL_LDFLAGS = -fPIE -pie +LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn +LOCAL_SRC_FILES:= minivpn.c dummy.cpp +LOCAL_MODULE = pievpn include $(BUILD_EXECUTABLE) |