diff options
Diffstat (limited to 'src/frontends/android/jni')
| -rw-r--r-- | src/frontends/android/jni/.gitignore | 2 | ||||
| -rw-r--r-- | src/frontends/android/jni/Android.mk | 4 | ||||
| -rw-r--r-- | src/frontends/android/jni/Application.mk | 1 | ||||
| -rw-r--r-- | src/frontends/android/jni/libandroidbridge/Android.mk | 1 | ||||
| -rw-r--r-- | src/frontends/android/jni/vstr/Android.mk | 11 |
5 files changed, 1 insertions, 18 deletions
diff --git a/src/frontends/android/jni/.gitignore b/src/frontends/android/jni/.gitignore index 98094a88b..ca5cf16ed 100644 --- a/src/frontends/android/jni/.gitignore +++ b/src/frontends/android/jni/.gitignore @@ -1,4 +1,2 @@ openssl strongswan -vstr/include -vstr/*/libvstr.a diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/jni/Android.mk index de3403f3d..8388436e5 100644 --- a/src/frontends/android/jni/Android.mk +++ b/src/frontends/android/jni/Android.mk @@ -20,7 +20,6 @@ include $(LOCAL_PATH)/strongswan/Android.common.mk # includes strongswan_PATH := $(LOCAL_PATH)/strongswan -libvstr_PATH := $(LOCAL_PATH)/vstr/include openssl_PATH := $(LOCAL_PATH)/openssl/include # CFLAGS (partially from a configure run using droid-gcc) @@ -53,7 +52,7 @@ strongswan_CFLAGS := \ -DMONOLITHIC \ -DUSE_IKEV1 \ -DUSE_IKEV2 \ - -DUSE_VSTR \ + -DUSE_BUILTIN_PRINTF \ -DDEBUG \ -DCHARON_UDP_PORT=0 \ -DCHARON_NATT_PORT=0 \ @@ -66,7 +65,6 @@ strongswan_CFLAGS += -DUSE_BYOD endif strongswan_BUILD := \ - vstr \ openssl \ libandroidbridge \ strongswan/src/libipsec \ diff --git a/src/frontends/android/jni/Application.mk b/src/frontends/android/jni/Application.mk index e4a675974..f11b57ec6 100644 --- a/src/frontends/android/jni/Application.mk +++ b/src/frontends/android/jni/Application.mk @@ -1,3 +1,2 @@ # select the ABI(s) to build for (see CPU-ARCH-ABIS.html in the NDK docs). -# Vstr has to be built accordingly first. APP_ABI := armeabi x86 diff --git a/src/frontends/android/jni/libandroidbridge/Android.mk b/src/frontends/android/jni/libandroidbridge/Android.mk index 7dd8ad677..fbe56d5b4 100644 --- a/src/frontends/android/jni/libandroidbridge/Android.mk +++ b/src/frontends/android/jni/libandroidbridge/Android.mk @@ -23,7 +23,6 @@ endif # build libandroidbridge ------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libipsec \ $(strongswan_PATH)/src/libhydra \ $(strongswan_PATH)/src/libcharon \ diff --git a/src/frontends/android/jni/vstr/Android.mk b/src/frontends/android/jni/vstr/Android.mk deleted file mode 100644 index 8e1c6850f..000000000 --- a/src/frontends/android/jni/vstr/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(TARGET_ARCH)/libvstr.a - -LOCAL_MODULE := libvstr - -LOCAL_PRELINK_MODULE := false - -include $(PREBUILT_STATIC_LIBRARY) |