Do not hardcode the path to the strongSwan sources.

diff --git a/Android.mk.in b/Android.mk.in
index 723f9e5..a94c744 100644 (file)
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -12,8 +12,9 @@ add_plugin = $(if $(call plugin_enabled,$(1)), \
                                $(addprefix plugins/$(subst -,_,$(strip $(1))/),$(2)))
 
 # includes
-libvstr_PATH = external/strongswan-support/vstr/include
-libgmp_PATH = external/strongswan-support/gmp
+strongswan_PATH := $(LOCAL_PATH)
+libvstr_PATH := external/strongswan-support/vstr/include
+libgmp_PATH := external/strongswan-support/gmp
 
 # CFLAGS (partially from a configure run using droid-gcc)
 strongswan_CFLAGS := \

diff --git a/src/charon/Android.mk b/src/charon/Android.mk
index 3df1411..68647db 100644 (file)
--- a/src/charon/Android.mk
+++ b/src/charon/Android.mk
@@ -214,8 +214,8 @@ LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic, \
 
 LOCAL_C_INCLUDES += \
        $(libvstr_PATH) \
-       external/strongswan/src/include \
-       external/strongswan/src/libstrongswan
+       $(strongswan_PATH)/src/include \
+       $(strongswan_PATH)/src/libstrongswan
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS)