diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
| commit | 576b0c26baf9b5b1418650a572604325ca7fb3af (patch) | |
| tree | 8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /ics-openvpn-stripped/main/jni | |
| parent | bbf877a099112acbf34589b01503c3f5ee135dc0 (diff) | |
| parent | 48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff) | |
Merge branch 'develop'0.8.0
Diffstat (limited to 'ics-openvpn-stripped/main/jni')
| -rw-r--r-- | ics-openvpn-stripped/main/jni/Android.mk | 13 | ||||
| -rw-r--r-- | ics-openvpn-stripped/main/jni/Application.mk | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ics-openvpn-stripped/main/jni/Android.mk b/ics-openvpn-stripped/main/jni/Android.mk index 33d0bc76..90074b0f 100644 --- a/ics-openvpn-stripped/main/jni/Android.mk +++ b/ics-openvpn-stripped/main/jni/Android.mk @@ -13,15 +13,18 @@ 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) - ifneq ($(TARGET_ARCH),mips) 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/ics-openvpn-stripped/main/jni/Application.mk b/ics-openvpn-stripped/main/jni/Application.mk index 718e79a8..21718248 100644 --- a/ics-openvpn-stripped/main/jni/Application.mk +++ b/ics-openvpn-stripped/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := all +APP_ABI := arm64-v8a armeabi armeabi-v7a mips x86 x86_64 APP_PLATFORM := android-14 APP_STL:=stlport_shared |