From d0e7ba3029b2fd42582413aa95773fe7dbdede90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 23 Sep 2014 18:10:57 +0200
Subject: Updated native subprojects from ics-openvpn.

---
 app/jni/Android.mk     | 13 ++++++++-----
 app/jni/Application.mk |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'app/jni')

diff --git a/app/jni/Android.mk b/app/jni/Android.mk
index 0c906f97..8418c9b8 100644
--- a/app/jni/Android.mk
+++ b/app/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 ($(WITH_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/app/jni/Application.mk b/app/jni/Application.mk
index 718e79a8..21718248 100644
--- a/app/jni/Application.mk
+++ b/app/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
-- 
cgit v1.2.3