summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-08-12 11:28:52 +0200
committerArne Schwabe <arne@rfc2549.org>2014-08-12 11:28:52 +0200
commit9df108a3adb6ef9423141c6ac18bb274958cc1ce (patch)
treeaa980951a1a0804bd9cdc808be7e3e18f7829aed
parentdeb731bba806d2bd3e85a1e7ea5c570530caf059 (diff)
Mips64 is broken
--HG-- extra : rebase_source : 6e3e62d2018aa9634dbee4172c769d9cd56bfc2f
-rw-r--r--main/jni/Android.mk13
-rw-r--r--main/jni/Application.mk2
2 files changed, 9 insertions, 6 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 33d0bc76..90074b0f 100644
--- a/main/jni/Android.mk
+++ b/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/main/jni/Application.mk b/main/jni/Application.mk
index 718e79a8..21718248 100644
--- a/main/jni/Application.mk
+++ b/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