From 80b267f9e3baccdf636e8302efd5cf277147d97e Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 16 Feb 2012 18:41:10 +0100 Subject: [PATCH] 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. --- Android.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \