mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-20 03:52:27 +02:00
Code

More breakpad bulding fixes

Browse Source
This commit is contained in:
Arne Schwabe 2016-09-28 09:39:15 +02:00
parent ab090f81af
commit def0b27771
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main/jni/Android.mk
View File

@ -5,26 +5,31 @@ JNI_DIR := $(call my-dir)
#WITH_MBEDTLS=1
#WITH_OPENVPN3=1
# Build openvpn with mbedTLS (OpenVPN3 core is always build with mbedTLS)
#WITH_BREAKPAD=0
#USE_BREAKPAD=0
include lzo/Android.mk
include openssl/Android.mk
ifeq ($(TARGET_ARCH),mips)
USE_BREAKPAD=0
endif
ifeq ($(TARGET_ARCH),mips64)
USE_BREAKPAD=0
endif
ifeq ($(USE_BREAKPAD),1)
WITH_BREAKPAD=0
else ifeq ($(TARGET_ARCH),mips64)
WITH_BREAKPAD=0
else ifeq ($(USE_BREAKPAD),1)
WITH_BREAKPAD=1
include breakpad/android/google_breakpad/Android.mk
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

6
main/jni/Application.mk
View File

@ -2,11 +2,13 @@ APP_ABI := arm64-v8a armeabi armeabi-v7a mips x86 x86_64
APP_PLATFORM := android-14
APP_STL:=stlport_static
#APP_STL:=gnustl_shared
#APP_STL:=gnustl_shared
#APP_OPTIM := release
#LOCAL_ARM_MODE := arm
#NDK_TOOLCHAIN_VERSION=clang
APP_CPPFLAGS += -std=c++11
APP_CPPFLAGS += -std=c++1y
APP_CFLAGS += -funwind-tables

2
main/openvpn

@ -1 +1 @@
Subproject commit 4e57efbe97f04cafb90864777415ca0ecfe2d893
Subproject commit 9d8801b6185d7453b4268a2767d5d63118bbb5d6