sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-27 00:00:29 -05:00
Code Issues Projects Releases Wiki Activity

android: Remove scepclient from old top-level Android.mk

Browse Source
This commit is contained in:
Tobias Brunner 2022-09-05 19:09:31 +02:00
parent 73901d2cc3
commit 7bc491a7fa
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Android.mk
View File

@ -7,12 +7,9 @@ include $(CLEAR_VARS)
# possible executables are # possible executables are
# starter - allows to control and configure the daemon from the command line # starter - allows to control and configure the daemon from the command line
# charon - the IKE daemon # charon - the IKE daemon
# scepclient - SCEP client
# if you enable starter or scepclient (see above) uncomment the proper # if you enable starter (see above) uncomment the following line
# lines here
# strongswan_BUILD_STARTER := true # strongswan_BUILD_STARTER := true
# strongswan_BUILD_SCEPCLIENT := true
# this is the list of plugins that are built into libstrongswan and charon # 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) # 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 \ pkcs1 pkcs8 pem xcbc hmac kdf kernel-netlink socket-default android-dns \
stroke eap-identity eap-mschapv2 eap-md5 eap-gtc 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 strongswan_STARTER_PLUGINS := kernel-netlink
# list of all plugins - used to enable them with the function below # list of all plugins - used to enable them with the function below
strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \ strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \
$(strongswan_STARTER_PLUGINS) \ $(strongswan_STARTER_PLUGINS))
$(strongswan_SCEPCLIENT_PLUGINS))
include $(LOCAL_PATH)/Android.common.mk include $(LOCAL_PATH)/Android.common.mk
@ -106,10 +97,5 @@ strongswan_BUILD += \
ipsec ipsec
endif endif
ifneq ($(strongswan_BUILD_SCEPCLIENT),)
strongswan_BUILD += \
scepclient
endif
include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \ include $(addprefix $(LOCAL_PATH)/src/,$(addsuffix /Android.mk, \
$(sort $(strongswan_BUILD)))) $(sort $(strongswan_BUILD))))