From fff4b74db26968bac72ade4bd6c702be7b51ec7a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 15 May 2012 16:59:00 +0200 Subject: Bye bye Pluto! Charon will take over IKEv1 duties from here. This also removes libfreeswan and whack. --- Android.mk.in | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'Android.mk.in') diff --git a/Android.mk.in b/Android.mk.in index 57fa8b1f4..2563b7a3d 100644 --- a/Android.mk.in +++ b/Android.mk.in @@ -6,12 +6,10 @@ include $(CLEAR_VARS) # build/target/product/core.mk # possible executables are # starter - allows to control and configure the daemons from the command line -# charon - the IKEv2 daemon -# pluto - the IKEv1 daemon +# charon - the IKE daemon -# if you enable starter and/or pluto (see above) uncomment the proper lines here +# if you enable starter (see above) uncomment this line too # strongswan_BUILD_STARTER := true -# strongswan_BUILD_PLUTO := true # 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) @@ -19,20 +17,10 @@ strongswan_CHARON_PLUGINS := openssl fips-prf random pubkey pkcs1 \ pem xcbc hmac kernel-netlink socket-default android \ stroke eap-identity eap-mschapv2 eap-md5 -ifneq ($(strongswan_BUILD_PLUTO),) -# if both daemons are enabled we use raw sockets in charon -strongswan_CHARON_PLUGINS := $(subst socket-default,socket-raw, \ - $(strongswan_CHARON_PLUGINS)) -# plugins loaded by pluto -strongswan_PLUTO_PLUGINS := openssl fips-prf random pubkey pkcs1 \ - pem xcbc hmac kernel-netlink xauth -endif - strongswan_STARTER_PLUGINS := kernel-netlink # list of all plugins - used to enable them with the function below strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \ - $(strongswan_PLUTO_PLUGINS) \ $(strongswan_STARTER_PLUGINS)) # helper macros to only add source files for plugins included in the list above @@ -115,18 +103,10 @@ strongswan_BUILD := \ ifneq ($(strongswan_BUILD_STARTER),) strongswan_BUILD += \ - libfreeswan \ starter \ stroke \ ipsec endif -ifneq ($(strongswan_BUILD_PLUTO),) -strongswan_BUILD += \ - libfreeswan \ - pluto \ - whack -endif - include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \ $(sort $(strongswan_BUILD)))) -- cgit v1.2.3