diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-04-27 15:11:54 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-05-02 16:41:49 +0200 |
| commit | 1bd213db79f6ed1666f22c82ca99added38eeb89 (patch) | |
| tree | aae0e1a4a70e39920aa371e4cf2371407a068dc4 /src | |
| parent | d9c5e6d786c024ec2d2ba841e24802a5daa8d1b9 (diff) | |
| download | strongswan-1bd213db79f6ed1666f22c82ca99added38eeb89.tar.bz2 strongswan-1bd213db79f6ed1666f22c82ca99added38eeb89.tar.xz | |
android: Use relative path for strongSwan sources
This avoids issues with recursion, which could have happened if the
strongswan directory was a symlink.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/android/app/src/main/jni/Android.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk index 9e81a14c5..5bbfeaa1b 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, \ |