android: Build native libraries also for x86

Requires an updated build script for Vstr.

diff --git a/src/frontends/android/jni/.gitignore b/src/frontends/android/jni/.gitignore
index 90fd652f097a2ed2148d9be027cea0601a9a7f03..98094a88b51e60bfd8ca26a849f6d00a424fe1d7 100644 (file)
--- 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 (file)
index 0000000..e4a6759
--- /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 87355a671dfbbfb2a9dc80a9d80e64d7fc623b62..8e1c6850fd566529a435ad4743f9e1a3f787a32e 100644 (file)
--- 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