From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 11 Oct 2011 14:16:51 +0000 (+0200)
Subject: Build libfreeswan on Android.
X-Git-Tag: 4.6.0~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd9970de6353665fb92323dd14f1e7e198280ad;p=thirdparty%2Fstrongswan.git

Build libfreeswan on Android.
---

diff --git a/Android.mk.in b/Android.mk.in
index 6207cfb54c..f03800910e 100644
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -82,4 +82,5 @@ include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \
 		libhydra \
 		libstrongswan \
 		libtncif \
+		libfreeswan \
 	))
diff --git a/src/libfreeswan/Android.mk b/src/libfreeswan/Android.mk
new file mode 100644
index 0000000000..e9805f0a39
--- /dev/null
+++ b/src/libfreeswan/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# copy-n-paste from Makefile.am
+LOCAL_SRC_FILES := \
+addrtoa.c addrtot.c addrtypeof.c anyaddr.c atoaddr.c atoasr.c \
+atosubnet.c atoul.c copyright.c datatot.c freeswan.h \
+goodmask.c initaddr.c initsaid.c initsubnet.c internal.h ipsec_param.h \
+pfkey_v2_build.c pfkey_v2_debug.c \
+pfkey_v2_ext_bits.c pfkey_v2_parse.c portof.c rangetoa.c \
+pfkey.h pfkeyv2.h rangetosubnet.c sameaddr.c \
+satot.c subnetof.c subnettoa.c subnettot.c \
+subnettypeof.c ttoaddr.c ttodata.c ttoprotoport.c ttosa.c ttosubnet.c ttoul.c \
+ultoa.c ultot.c
+
+# build libfreeswan ------------------------------------------------------------
+
+LOCAL_C_INCLUDES += \
+	$(libvstr_PATH) \
+	$(strongswan_PATH)/src/include \
+	$(strongswan_PATH)/src/libstrongswan \
+	$(strongswan_PATH)/src/libhydra \
+	$(strongswan_PATH)/src/pluto
+
+LOCAL_CFLAGS := $(strongswan_CFLAGS)
+
+LOCAL_MODULE := libfreeswan
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_SHARED_LIBRARIES += libstrongswan
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/src/libfreeswan/Makefile.am b/src/libfreeswan/Makefile.am
index 09f5fe2cdd..bc12fe386e 100644
--- a/src/libfreeswan/Makefile.am
+++ b/src/libfreeswan/Makefile.am
@@ -1,13 +1,14 @@
 noinst_LIBRARIES = libfreeswan.a
-libfreeswan_a_SOURCES = addrtoa.c addrtot.c addrtypeof.c anyaddr.c atoaddr.c atoasr.c \
-			atosubnet.c atoul.c copyright.c datatot.c freeswan.h \
-			goodmask.c initaddr.c initsaid.c initsubnet.c internal.h ipsec_param.h \
-			pfkey_v2_build.c pfkey_v2_debug.c \
-			pfkey_v2_ext_bits.c pfkey_v2_parse.c portof.c rangetoa.c \
-			pfkey.h pfkeyv2.h rangetosubnet.c sameaddr.c \
-			satot.c subnetof.c subnettoa.c subnettot.c \
-			subnettypeof.c ttoaddr.c ttodata.c ttoprotoport.c ttosa.c ttosubnet.c ttoul.c \
-			ultoa.c ultot.c
+libfreeswan_a_SOURCES = \
+addrtoa.c addrtot.c addrtypeof.c anyaddr.c atoaddr.c atoasr.c \
+atosubnet.c atoul.c copyright.c datatot.c freeswan.h \
+goodmask.c initaddr.c initsaid.c initsubnet.c internal.h ipsec_param.h \
+pfkey_v2_build.c pfkey_v2_debug.c \
+pfkey_v2_ext_bits.c pfkey_v2_parse.c portof.c rangetoa.c \
+pfkey.h pfkeyv2.h rangetosubnet.c sameaddr.c \
+satot.c subnetof.c subnettoa.c subnettot.c \
+subnettypeof.c ttoaddr.c ttodata.c ttoprotoport.c ttosa.c ttosubnet.c ttoul.c \
+ultoa.c ultot.c
 
 INCLUDES = \
 -I$(top_srcdir)/src/libstrongswan \