denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrating libhydra into the Android build system.

Browse Source
This commit is contained in:
Tobias Brunner
2010-04-12 16:47:47 +02:00
parent b73b3a033f
commit 6edbe1652b
6 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk.in
+1
View File
@@ -59,5 +59,6 @@ strongswan_CFLAGS += \
include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \
charon \
libcharon \
libhydra \
libstrongswan \
))
src/charon/Android.mk
+2 -1
View File
@@ -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)
src/libcharon/Android.mk
+2 -1
View File
@@ -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)
src/libhydra/Android.mk
+34
View File
@@ -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)
src/libhydra/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@ AM_CFLAGS = \
-DPLUGINDIR=\"${plugindir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\"
#EXTRA_DIST = Android.mk
EXTRA_DIST = Android.mk
# build optional plugins
########################
src/libstrongswan/Android.mk
-3
View File
@@ -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 \