denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use filter instead of findstring to check for enabled plugins in Android.mk.

Browse Source 
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:
Tobias Brunner
2012-08-08 15:07:43 +02:00
parent 162621ed57
commit 80b267f9e3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk.in
+1 -1
View File
@@ -34,7 +34,7 @@ strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \
# helper macros to only add source files for plugins included in the list above # 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 # 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)), \ add_plugin = $(if $(call plugin_enabled,$(1)), \
$(patsubst $(LOCAL_PATH)/%,%, \ $(patsubst $(LOCAL_PATH)/%,%, \
$(wildcard \ $(wildcard \