From 29d93e247059470f34097ca1013b264c345618e3 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 20 Mar 2013 14:50:41 +0100 Subject: [PATCH] android: Build native libraries also for x86 Requires an updated build script for Vstr. --- src/frontends/android/jni/.gitignore | 2 +- src/frontends/android/jni/Application.mk | 3 +++ src/frontends/android/jni/vstr/Android.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/frontends/android/jni/Application.mk diff --git a/src/frontends/android/jni/.gitignore b/src/frontends/android/jni/.gitignore index 90fd652f09..98094a88b5 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 0000000000..e4a6759744 --- /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 87355a671d..8e1c6850fd 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 -- 2.47.2