summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/jni
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-04 20:45:42 +0100
committerParménides GV <parmegv@sdf.org>2014-11-04 20:45:42 +0100
commit5304543ebd60778ad46123cd63142e27627fa150 (patch)
treeb07723b530e20b23ae83de822387f6551ea7f9f4 /ics-openvpn-stripped/main/jni
parent713c3a98f53a6bd1ad94e90f28d3e37d20abfab9 (diff)
Update ics-openvpn to rev 906.
Diffstat (limited to 'ics-openvpn-stripped/main/jni')
-rw-r--r--ics-openvpn-stripped/main/jni/Android.mk13
-rw-r--r--ics-openvpn-stripped/main/jni/Application.mk2
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