diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-09-26 09:46:26 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-09-26 09:46:26 +0200 |
| commit | 394451dbae3e71282611058e00b5fd16c865f147 (patch) | |
| tree | 17b71034d9350a2848603f5edf0a8b13025909be /app/jni | |
| parent | 644fd02cf8da95b0b5a99fb9f2142628dd27f7c2 (diff) | |
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.
Diffstat (limited to 'app/jni')
| -rw-r--r-- | app/jni/Android.mk | 13 | ||||
| -rw-r--r-- | app/jni/Application.mk | 2 |
2 files changed, 6 insertions, 9 deletions
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 |