diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-04 19:20:15 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-04 19:20:15 +0200 |
| commit | 27594eeae6f40a402bc3110f06d57975168e74e3 (patch) | |
| tree | cdabf6571e6f4ff07205fd6921d8095539a1fcdc /app/jni/Android.mk | |
| parent | 8dc4f58d96892fbfd83094fb85b1d17656035290 (diff) | |
ics-openvpn as a submodule! beautiful
ics-openvpn is now officially on GitHub, and they track openssl and
openvpn as submodules, so it's easier to update everything. Just a git
submodule update --recursive.
I've also set up soft links to native modules from ics-openvpn in app,
so that we don't copy files in Gradle (which was causing problems with
the submodules .git* files, not being copied). That makes the repo
cleaner.
Diffstat (limited to 'app/jni/Android.mk')
| -rw-r--r-- | app/jni/Android.mk | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk deleted file mode 100644 index df8cbb34..00000000 --- a/app/jni/Android.mk +++ /dev/null @@ -1,77 +0,0 @@ -# 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) -#WITH_BREAKPAD=0 - - -include lzo/Android.mk -include snappy/Android.mk - -include openssl/Android.mk - -ifeq ($(TARGET_ARCH),mips) - USE_BREAKPAD=0 -endif -ifeq ($(TARGET_ARCH),mips64) - USE_BREAKPAD=0 -endif - -ifneq ($(USE_BREAKPAD),0) - WITH_BREAKPAD=1 - include google-breakpad/android/google_breakpad/Android.mk -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) - -# The only real JNI library -include $(CLEAR_VARS) -LOCAL_LDLIBS := -llog -lz -LOCAL_CFLAGS = --std=c99 -LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl -LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp scan_ifs.c -LOCAL_MODULE = opvpnutil -LOCAL_SHARED_LIBRARIES := libcrypto -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) -LOCAL_LDLIBS := -lz -lc -LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn -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) - |