diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-02-16 18:41:10 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-08-08 15:07:43 +0200 |
| commit | 80b267f9e3baccdf636e8302efd5cf277147d97e (patch) | |
| tree | 4882c3ad14ac29bd8446e30942a6eac3ed550871 | |
| parent | 162621ed573b73daa63f77c30c283bd5dcac9b2f (diff) | |
| download | strongswan-80b267f9e3baccdf636e8302efd5cf277147d97e.tar.bz2 strongswan-80b267f9e3baccdf636e8302efd5cf277147d97e.tar.xz | |
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.
| -rw-r--r-- | Android.mk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk.in b/Android.mk.in index 19048b9e7..2b51d3ea1 100644 --- a/Android.mk.in +++ b/Android.mk.in @@ -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 \ |