From: Tobias Brunner Date: Mon, 5 Sep 2022 17:09:31 +0000 (+0200) Subject: android: Remove scepclient from old top-level Android.mk X-Git-Tag: 5.9.8dr3~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bc491a7fa9c3982542da70fe2688b9c7798e0a7;p=thirdparty%2Fstrongswan.git android: Remove scepclient from old top-level Android.mk --- diff --git a/Android.mk b/Android.mk index a69599598f..c8815fbff6 100644 --- a/Android.mk +++ b/Android.mk @@ -7,12 +7,9 @@ include $(CLEAR_VARS) # possible executables are # starter - allows to control and configure the daemon from the command line # charon - the IKE daemon -# scepclient - SCEP client -# if you enable starter or scepclient (see above) uncomment the proper -# lines here +# if you enable starter (see above) uncomment the following line # strongswan_BUILD_STARTER := true -# strongswan_BUILD_SCEPCLIENT := 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) @@ -20,17 +17,11 @@ strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \ pkcs1 pkcs8 pem xcbc hmac kdf kernel-netlink socket-default android-dns \ stroke eap-identity eap-mschapv2 eap-md5 eap-gtc -ifneq ($(strongswan_BUILD_SCEPCLIENT),) -# plugins loaded by scepclient -strongswan_SCEPCLIENT_PLUGINS := openssl curl fips-prf random pkcs1 pkcs7 pem -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_STARTER_PLUGINS) \ - $(strongswan_SCEPCLIENT_PLUGINS)) + $(strongswan_STARTER_PLUGINS)) include $(LOCAL_PATH)/Android.common.mk @@ -106,10 +97,5 @@ strongswan_BUILD += \ ipsec endif -ifneq ($(strongswan_BUILD_SCEPCLIENT),) -strongswan_BUILD += \ - scepclient -endif - include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \ $(sort $(strongswan_BUILD))))