android: Use relative path for strongSwan sources

This avoids issues with recursion, which could have happened if the
strongswan directory was a symlink.
This commit is contained in:
Tobias Brunner 2016-04-27 15:11:54 +02:00
parent d9c5e6d786
commit 1bd213db79

View File

@ -16,12 +16,14 @@ endif
strongswan_PLUGINS := $(strongswan_CHARON_PLUGINS) \
$(strongswan_BYOD_PLUGINS)
include $(LOCAL_PATH)/strongswan/Android.common.mk
strongswan_DIR := ../../../../../../../
# includes
strongswan_PATH := $(LOCAL_PATH)/strongswan
strongswan_PATH := $(LOCAL_PATH)/$(strongswan_DIR)
openssl_PATH := $(LOCAL_PATH)/openssl/include
include $(strongswan_PATH)/Android.common.mk
# CFLAGS (partially from a configure run using droid-gcc)
strongswan_CFLAGS := \
-Wall \
@ -67,15 +69,15 @@ endif
strongswan_BUILD := \
openssl \
libandroidbridge \
strongswan/src/libipsec \
strongswan/src/libcharon \
strongswan/src/libstrongswan
$(strongswan_DIR)/src/libipsec \
$(strongswan_DIR)/src/libcharon \
$(strongswan_DIR)/src/libstrongswan
ifneq ($(strongswan_USE_BYOD),)
strongswan_BUILD += \
strongswan/src/libtnccs \
strongswan/src/libtncif \
strongswan/src/libimcv
$(strongswan_DIR)/src/libtnccs \
$(strongswan_DIR)/src/libtncif \
$(strongswan_DIR)/src/libimcv
endif
include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \