From: Tobias Brunner Date: Wed, 27 Apr 2016 13:11:54 +0000 (+0200) Subject: android: Use relative path for strongSwan sources X-Git-Tag: 5.4.1dr2~16^2~22 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1bd213db79f6ed1666f22c82ca99added38eeb89;p=thirdparty%2Fstrongswan.git android: Use relative path for strongSwan sources This avoids issues with recursion, which could have happened if the strongswan directory was a symlink. --- diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk index 9e81a14c56..5bbfeaa1b1 100644 --- a/src/frontends/android/app/src/main/jni/Android.mk +++ b/src/frontends/android/app/src/main/jni/Android.mk @@ -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, \