Use separate plugin lists for pluto and charon on Android.

diff --git a/Android.mk.in b/Android.mk.in
index 4b6d485e8e65e22182165a640d7ebb3159aa1ca4..efb4f42cf226678382dcee3e79ca7e01b1edbb10 100644 (file)
--- 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 34c77377c89a63335ded5b1a52316c2c73f2462b..974139ac0b976d69c299efbaaa88a7e52a477a77 100644 (file)
--- 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 5ac8d003813045e19c3f2a7e97e57e5637e8cbfd..5899ed0e2fb31a6c7b0b41948acfe783788e3eeb 100644 (file)
--- 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