diff options
Diffstat (limited to 'app/jni')
| -rw-r--r-- | app/jni/Android.mk | 17 | ||||
| -rw-r--r-- | app/jni/Application.mk | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk index 0c906f97..90074b0f 100644 --- a/app/jni/Android.mk +++ b/app/jni/Android.mk @@ -5,7 +5,7 @@ JNI_DIR := $(call my-dir) #WITH_POLAR=1 #WITH_OPENVPN3=1 # Build openvpn with polar (OpenVPN3 core is always build with polar) -WITH_BREAKPAD=0 +#WITH_BREAKPAD=0 include lzo/Android.mk @@ -13,15 +13,18 @@ include snappy/Android.mk include openssl/Android.mk -ifneq ($(WITH_BREAKPAD),0) - ifneq ($(TARGET_ARCH),mips) +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 else -WITH_BREAKPAD=0 + WITH_BREAKPAD=0 endif ifeq ($(WITH_POLAR),1) diff --git a/app/jni/Application.mk b/app/jni/Application.mk index 718e79a8..f85269d8 100644 --- a/app/jni/Application.mk +++ b/app/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := all +APP_ABI := all32 APP_PLATFORM := android-14 APP_STL:=stlport_shared @@ -8,4 +8,4 @@ APP_STL:=stlport_shared #LOCAL_ARM_MODE := arm -#NDK_TOOLCHAIN_VERSION=clang
\ No newline at end of file +#NDK_TOOLCHAIN_VERSION=clang |