From bb3357e886cdbee31c352d171ac89e69ddd0fde2 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 21 Oct 2011 14:16:42 +0200 Subject: [PATCH] starter: Android.mk updated to use kernel-netlink via libhydra. --- Android.mk.in | 5 ++++- src/starter/Android.mk | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Android.mk.in b/Android.mk.in index 818303b31..c4a259514 100644 --- a/Android.mk.in +++ b/Android.mk.in @@ -22,9 +22,12 @@ strongswan_PLUTO_PLUGINS := openssl fips-prf random pubkey pkcs1 \ pem xcbc hmac kernel-netlink xauth endif +strongswan_STARTER_PLUGINS := kernel-netlink + # list of all plugins - used to enable them with the function below strongswan_PLUGINS := $(sort $(strongswan_CHARON_PLUGINS) \ - $(strongswan_PLUTO_PLUGINS)) + $(strongswan_PLUTO_PLUGINS) \ + $(strongswan_STARTER_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 diff --git a/src/starter/Android.mk b/src/starter/Android.mk index 3d094b578..48e4b0b27 100644 --- a/src/starter/Android.mk +++ b/src/starter/Android.mk @@ -21,7 +21,8 @@ LOCAL_C_INCLUDES += \ $(strongswan_PATH)/src/whack \ $(strongswan_PATH)/src/stroke -LOCAL_CFLAGS := $(strongswan_CFLAGS) -DSTART_CHARON +LOCAL_CFLAGS := $(strongswan_CFLAGS) -DSTART_CHARON \ + -DPLUGINS='"$(strongswan_STARTER_PLUGINS)"' ifneq ($(strongswan_BUILD_PLUTO),) LOCAL_CFLAGS += -DSTART_PLUTO @@ -33,7 +34,7 @@ LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES += libstrongswan libfreeswan +LOCAL_SHARED_LIBRARIES += libstrongswan libhydra libfreeswan include $(BUILD_EXECUTABLE)