diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2016-09-28 09:39:15 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2016-09-28 09:39:15 +0200 |
| commit | def0b27771ad310a1a75d8d11716def24ec98765 (patch) | |
| tree | 9195206422f29a455bb8f5dff156754ce65eac75 | |
| parent | ab090f81af6fc534d1db2ba82e3882bf6f0d82d4 (diff) | |
More breakpad bulding fixes
| -rw-r--r-- | main/jni/Android.mk | 23 | ||||
| -rw-r--r-- | main/jni/Application.mk | 6 | ||||
| m--------- | main/openvpn | 0 |
3 files changed, 18 insertions, 11 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk index fed2bdea..361f2184 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -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 diff --git a/main/jni/Application.mk b/main/jni/Application.mk index 2d9b2fe2..caabab79 100644 --- a/main/jni/Application.mk +++ b/main/jni/Application.mk @@ -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 diff --git a/main/openvpn b/main/openvpn -Subproject 4e57efbe97f04cafb90864777415ca0ecfe2d89 +Subproject 9d8801b6185d7453b4268a2767d5d63118bbb5d |