Integrating libhydra into the Android build system.

6 files changed, 40 insertions, 6 deletions

diff --git a/Android.mk.in b/Android.mk.in
index 8ac570cb4..4a4b7df96 100644
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -59,5 +59,6 @@ strongswan_CFLAGS += \
 include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \
 		charon \
 		libcharon \
+		libhydra \
 		libstrongswan \
 	))
diff --git a/src/charon/Android.mk b/src/charon/Android.mk
index 603bdd2a5..491d7f946 100644
--- a/src/charon/Android.mk
+++ b/src/charon/Android.mk
@@ -9,6 +9,7 @@ charon.c
 
 LOCAL_C_INCLUDES += \
 	$(libvstr_PATH) \
+	$(strongswan_PATH)/src/libhydra \
 	$(strongswan_PATH)/src/libcharon \
 	$(strongswan_PATH)/src/libstrongswan
 
@@ -20,7 +21,7 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES += libstrongswan libcharon
+LOCAL_SHARED_LIBRARIES += libstrongswan libhydra libcharon
 
 include $(BUILD_EXECUTABLE)
 
diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 7588533bc..d473b455e 100644
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -157,6 +157,7 @@ LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic)
 LOCAL_C_INCLUDES += \
 	$(libvstr_PATH) \
 	$(strongswan_PATH)/src/include \
+	$(strongswan_PATH)/src/libhydra \
 	$(strongswan_PATH)/src/libstrongswan
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS)
@@ -167,7 +168,7 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES += libstrongswan
+LOCAL_SHARED_LIBRARIES += libstrongswan libhydra
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk
new file mode 100644
index 000000000..caad7447a
--- /dev/null
+++ b/src/libhydra/Android.mk
@@ -0,0 +1,34 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# copy-n-paste from Makefile.am
+LOCAL_SRC_FILES := \
+hydra.c hydra.h \
+attributes/attributes.c attributes/attributes.h \
+attributes/attribute_provider.h attributes/attribute_handler.h \
+attributes/attribute_manager.c attributes/attribute_manager.h \
+attributes/mem_pool.c attributes/mem_pool.h
+
+# adding the plugin source files
+
+LOCAL_SRC_FILES += $(call add_plugin, attr)
+
+# build libcharon --------------------------------------------------------------
+
+LOCAL_C_INCLUDES += \
+	$(libvstr_PATH) \
+	$(strongswan_PATH)/src/include \
+	$(strongswan_PATH)/src/libstrongswan
+
+LOCAL_CFLAGS := $(strongswan_CFLAGS)
+
+LOCAL_MODULE := libhydra
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_SHARED_LIBRARIES += libstrongswan
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index cbf07c70d..601a56e38 100644
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -15,7 +15,7 @@ AM_CFLAGS = \
 -DPLUGINDIR=\"${plugindir}\" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
 
-#EXTRA_DIST = Android.mk
+EXTRA_DIST = Android.mk
 
 # build optional plugins
 ########################
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 2dc4e58ba..d639220e3 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -12,9 +12,6 @@ printf_hook.c printf_hook.h \
 asn1/asn1.c asn1/asn1.h \
 asn1/asn1_parser.c asn1/asn1_parser.h \
 asn1/oid.c asn1/oid.h \
-attributes/attributes.c attributes/attributes.h \
-attributes/attribute_provider.h attributes/attribute_handler.h \
-attributes/attribute_manager.c attributes/attribute_manager.h \
 crypto/crypters/crypter.c crypto/crypters/crypter.h \
 crypto/hashers/hasher.h crypto/hashers/hasher.c \
 crypto/pkcs9.c crypto/pkcs9.h \