aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/frontends/android/jni/.gitignore2
-rw-r--r--src/frontends/android/jni/Application.mk3
-rw-r--r--src/frontends/android/jni/vstr/Android.mk2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/frontends/android/jni/.gitignore b/src/frontends/android/jni/.gitignore
index 90fd652f0..98094a88b 100644
--- a/src/frontends/android/jni/.gitignore
+++ b/src/frontends/android/jni/.gitignore
@@ -1,4 +1,4 @@
openssl
strongswan
-vstr/libvstr.a
vstr/include
+vstr/*/libvstr.a
diff --git a/src/frontends/android/jni/Application.mk b/src/frontends/android/jni/Application.mk
new file mode 100644
index 000000000..e4a675974
--- /dev/null
+++ b/src/frontends/android/jni/Application.mk
@@ -0,0 +1,3 @@
+# select the ABI(s) to build for (see CPU-ARCH-ABIS.html in the NDK docs).
+# Vstr has to be built accordingly first.
+APP_ABI := armeabi x86
diff --git a/src/frontends/android/jni/vstr/Android.mk b/src/frontends/android/jni/vstr/Android.mk
index 87355a671..8e1c6850f 100644
--- a/src/frontends/android/jni/vstr/Android.mk
+++ b/src/frontends/android/jni/vstr/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := libvstr.a
+LOCAL_SRC_FILES := $(TARGET_ARCH)/libvstr.a
LOCAL_MODULE := libvstr