aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2010-03-16 17:18:58 +0100
committerTobias Brunner <tobias@strongswan.org>2010-03-19 13:34:53 +0100
commit52c7257366e841f4dea0d1086681ec300bc1b9eb (patch)
tree41fab8de9ac08a8e9dda6a3e94638acf8b745e27 /src
parent78060ba0632e26bafccfa9a2fefa70a9e5ac98fc (diff)
downloadstrongswan-52c7257366e841f4dea0d1086681ec300bc1b9eb.tar.bz2
strongswan-52c7257366e841f4dea0d1086681ec300bc1b9eb.tar.xz
Adding support for the build of libcharon (and charon) on Android.
Diffstat (limited to 'src')
-rw-r--r--src/charon/Android.mk26
-rw-r--r--src/libcharon/Android.mk9
2 files changed, 29 insertions, 6 deletions
diff --git a/src/charon/Android.mk b/src/charon/Android.mk
new file mode 100644
index 000000000..e8bb89aa2
--- /dev/null
+++ b/src/charon/Android.mk
@@ -0,0 +1,26 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# copy-n-paste from Makefile.am
+LOCAL_SRC_FILES := \
+ charon.c
+
+# build charon -----------------------------------------------------------------
+
+LOCAL_C_INCLUDES += \
+ $(libvstr_PATH) \
+ $(strongswan_PATH)/src/libcharon \
+ $(strongswan_PATH)/src/libstrongswan
+
+LOCAL_CFLAGS := $(strongswan_CFLAGS)
+
+LOCAL_MODULE := charon
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_SHARED_LIBRARIES += libstrongswan libcharon
+
+include $(BUILD_EXECUTABLE)
+
diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 68647dbe5..8e0d4e624 100644
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -210,7 +210,7 @@ LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic, \
socket_dynamic_socket.h socket_dynamic_socket.c \
)
-# build charon -----------------------------------------------------------------
+# build libcharon --------------------------------------------------------------
LOCAL_C_INCLUDES += \
$(libvstr_PATH) \
@@ -219,10 +219,7 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS := $(strongswan_CFLAGS)
-# this is required to be able load the plugins
-LOCAL_LDFLAGS := -Wl,--export-dynamic
-
-LOCAL_MODULE := charon
+LOCAL_MODULE := libcharon
LOCAL_ARM_MODE := arm
@@ -230,5 +227,5 @@ LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES += libstrongswan
-include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_LIBRARY)