Use filter instead of findstring to check for enabled plugins in Android.mk.
findstring is not prefix-safe (i.e. android matches android-log). On the other hand filter matches words separated by whitespace and if no wildcard (%) is used the full word has to match.
This commit is contained in:
parent
162621ed57
commit
80b267f9e3
|
@ -34,7 +34,7 @@ strongswan_PLUGINS := $(sort $(strongswan_CHARON_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))
|
||||
plugin_enabled = $(filter $(1), $(strongswan_PLUGINS))
|
||||
add_plugin = $(if $(call plugin_enabled,$(1)), \
|
||||
$(patsubst $(LOCAL_PATH)/%,%, \
|
||||
$(wildcard \
|
||||
|
|
Loading…
Reference in New Issue