From 394451dbae3e71282611058e00b5fd16c865f147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 26 Sep 2014 09:46:26 +0200
Subject: Revert "Updated native subprojects from ics-openvpn."

This reverts commit d0e7ba3029b2fd42582413aa95773fe7dbdede90.

I'll postpone this work for the next cycle, it's not trivial because it doesn't link properly.
---
 app/jni/Android.mk     | 13 +++++--------
 app/jni/Application.mk |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'app/jni')

diff --git a/app/jni/Android.mk b/app/jni/Android.mk
index 8418c9b8..0c906f97 100644
--- a/app/jni/Android.mk
+++ b/app/jni/Android.mk
@@ -13,18 +13,15 @@ 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
+	else
 	WITH_BREAKPAD=0
+	endif
+else
+WITH_BREAKPAD=0
 endif
 
 ifeq ($(WITH_POLAR),1)
diff --git a/app/jni/Application.mk b/app/jni/Application.mk
index 21718248..718e79a8 100644
--- a/app/jni/Application.mk
+++ b/app/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_ABI := arm64-v8a armeabi armeabi-v7a mips  x86 x86_64
+APP_ABI := all
 APP_PLATFORM := android-14
 
 APP_STL:=stlport_shared
-- 
cgit v1.2.3