summaryrefslogtreecommitdiff
path: root/main/jni
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2018-06-14 17:59:36 +0200
committerArne Schwabe <arne@rfc2549.org>2018-06-14 17:59:36 +0200
commitd987d942d15481080e968463a8ffe84a41f88574 (patch)
tree50b30a9f94a8325bb52a945e205c4fa935e2ec5b /main/jni
parent842aeac4d7e36f9f4a4fb95e402eeb1e830530c1 (diff)
Remove old files left over from the old ndk-build
Diffstat (limited to 'main/jni')
-rw-r--r--main/jni/Android.mk88
-rw-r--r--main/jni/Application.mk18
-rw-r--r--main/jni/dummy.cpp8
-rw-r--r--main/jni/minivpn.c0
4 files changed, 0 insertions, 114 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
deleted file mode 100644
index ae45c10d..00000000
--- a/main/jni/Android.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-# Path of the sources
-JNI_DIR := $(call my-dir)
-
-#optional arguments
-#WITH_MBEDTLS=1
-#WITH_OPENVPN3=1
-# Build openvpn with mbedTLS (OpenVPN3 core is always build with mbedTLS)
-#USE_BREAKPAD=0
-
-include lzo/Android.mk
-include openssl/Android.mk
-
-ifeq ($(TARGET_ARCH),mips)
- WITH_BREAKPAD=0
-else ifeq ($(TARGET_ARCH),mips64)
- WITH_BREAKPAD=0
-else ifeq ($(USE_BREAKPAD),1)
- WITH_BREAKPAD=1
-else
- WITH_BREAKPAD=0
-endif
-
-#ifeq ($(TARGET_ARCH),x86)
-# USE_BREAKPAD=0
-#endif
-
-
-ifeq ($(WITH_BREAKPAD),1)
- include breakpad/android/google_breakpad/Android.mk
-endif
-
-ifeq ($(WITH_MBEDTLS),1)
- USE_MBEDTLS=1
-endif
-ifeq ($(WITH_OPENVPN3),1)
- USE_MBEDTLS=1
-endif
-
-ifeq ($(USE_MBEDTLS),1)
- include mbedtls/Android.mk
-endif
-
-include openvpn/Android.mk
-
-ifeq ($(WITH_OPENVPN3),1)
- include ovpn3/Android.mk
-endif
-
-LOCAL_PATH := $(JNI_DIR)
-
-# The only real JNI libraries
-include $(CLEAR_VARS)
-LOCAL_LDLIBS := -llog -lz
-LOCAL_CFLAGS = -DTARGET_ARCH_ABI=\"${TARGET_ARCH_ABI}\"
-LOCAL_SRC_FILES:= jniglue.c scan_ifs.c sslspeed.c
-LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl openssl/crypto/include
-LOCAL_MODULE = opvpnutil
-LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_LDLIBS := -llog -lz
-LOCAL_CFLAGS =
-LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl openssl/crypto/include
-LOCAL_SRC_FILES:= jbcrypto.cpp
-LOCAL_MODULE = jbcrypto
-LOCAL_SHARED_LIBRARIES := libcrypto
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_LDLIBS := -lz -lc
-LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static openvpn
-LOCAL_SRC_FILES:= minivpn.c dummy.cpp
-LOCAL_MODULE = nopie_openvpn
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-LOCAL_LDLIBS := -lz -lc
-LOCAL_CFLAGS= -fPIE -pie
-LOCAL_CFLAGS = -fPIE
-LOCAL_LDFLAGS = -fPIE -pie
-LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static openvpn
-LOCAL_SRC_FILES:= minivpn.c dummy.cpp
-LOCAL_MODULE = pie_openvpn
-include $(BUILD_EXECUTABLE)
-
diff --git a/main/jni/Application.mk b/main/jni/Application.mk
deleted file mode 100644
index 7033ee93..00000000
--- a/main/jni/Application.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(USE_SHORT_COMMANDS),1)
- APP_SHORT_COMMANDS := true
-endif
-
-APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
-APP_PLATFORM := android-14
-
-#APP_STL:=stlport_static
-APP_STL:=c++_static
-
-
-#APP_OPTIM := release
-
-#NDK_TOOLCHAIN_VERSION=4.9
-APP_CPPFLAGS += -std=c++1y
-APP_CFLAGS += -funwind-tables
-
-
diff --git a/main/jni/dummy.cpp b/main/jni/dummy.cpp
deleted file mode 100644
index 58466656..00000000
--- a/main/jni/dummy.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-/*#include <string>
-#include <iostream>
-
-void dummy()
-{
- std::cout << "I am a dummy function to help compile on Android NDK r9" << std::endl;
-}
-*/
diff --git a/main/jni/minivpn.c b/main/jni/minivpn.c
deleted file mode 100644
index e69de29b..00000000
--- a/main/jni/minivpn.c
+++ /dev/null