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