diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-10-13 18:34:43 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-10-13 18:34:43 +0200 |
| commit | 9227a3b3fade1f131cffe2faa981d2b8e0aed18c (patch) | |
| tree | 0e8ee04e2e7e7f8e789dd50f545b7b26ec1eea98 | |
| parent | 504c524c13d1ef8bba45845883b70f460290d628 (diff) | |
| download | strongswan-9227a3b3fade1f131cffe2faa981d2b8e0aed18c.tar.bz2 strongswan-9227a3b3fade1f131cffe2faa981d2b8e0aed18c.tar.xz | |
Use separate plugin lists for pluto and charon on Android.
| -rw-r--r-- | Android.mk.in | 11 | ||||
| -rw-r--r-- | src/libcharon/Android.mk | 3 | ||||
| -rw-r--r-- | src/pluto/Android.mk | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/Android.mk.in b/Android.mk.in index 4b6d485e8..efb4f42cf 100644 --- a/Android.mk.in +++ b/Android.mk.in @@ -3,10 +3,18 @@ include $(CLEAR_VARS) # this is the list of plugins that are built into libstrongswan and charon # also these plugins are loaded by default (if not changed in strongswan.conf) -strongswan_PLUGINS := openssl fips-prf random pubkey pkcs1 \ +strongswan_CHARON_PLUGINS := openssl fips-prf random pubkey pkcs1 \ pem xcbc hmac kernel-netlink socket-default android \ stroke eap-identity eap-mschapv2 eap-md5 +# plugins loaded by pluto +strongswan_PLUTO_PLUGINS := openssl fips-prf random pubkey pkcs1 \ + pem xcbc hmac kernel-netlink xauth + +# list of all plugins - used to enable them with the function below +strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \ + $(strongswan_PLUTO_PLUGINS)) + # helper macros to only add source files for plugins included in the list above # source files are relative to the android.mk that called the macro plugin_enabled = $(findstring $(1), $(strongswan_PLUGINS)) @@ -64,7 +72,6 @@ strongswan_CFLAGS := \ -DROUTING_TABLE=0 \ -DROUTING_TABLE_PRIO=220 \ -DVERSION=\"$(strongswan_VERSION)\" \ - -DPLUGINS='"$(strongswan_PLUGINS)"' \ -DPLUGINDIR=\"$(strongswan_PLUGINDIR)\" \ -DIPSEC_DIR=\"$(strongswan_DIR)\" \ -DIPSEC_PIDDIR=\"$(strongswan_PIDDIR)\" \ diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk index 34c77377c..974139ac0 100644 --- a/src/libcharon/Android.mk +++ b/src/libcharon/Android.mk @@ -162,7 +162,8 @@ LOCAL_C_INCLUDES += \ $(strongswan_PATH)/src/libstrongswan \ $(strongswan_PATH)/src/libtncif -LOCAL_CFLAGS := $(strongswan_CFLAGS) +LOCAL_CFLAGS := $(strongswan_CFLAGS) \ + -DPLUGINS='"$(strongswan_CHARON_PLUGINS)"' LOCAL_MODULE := libcharon diff --git a/src/pluto/Android.mk b/src/pluto/Android.mk index 5ac8d0038..5899ed0e2 100644 --- a/src/pluto/Android.mk +++ b/src/pluto/Android.mk @@ -62,7 +62,8 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS := $(strongswan_CFLAGS) \ -DPLUTO -DVENDORID -DXAUTH_VID -DCISCO_QUIRKS \ - -DTHREADS -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES + -DTHREADS -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \ + -DPLUGINS='"$(strongswan_PLUTO_PLUGINS)"' LOCAL_MODULE := pluto |