From: Tobias Brunner Date: Wed, 13 Nov 2013 10:29:59 +0000 (+0100) Subject: android: Remove dependency on libvstr X-Git-Tag: 5.1.2dr1~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20c99edab97e617cb83c000e8319d0d86234112b;p=thirdparty%2Fstrongswan.git android: Remove dependency on libvstr --- diff --git a/Android.mk b/Android.mk index aa61cc0e78..6ad220b7a5 100644 --- a/Android.mk +++ b/Android.mk @@ -36,7 +36,6 @@ include $(LOCAL_PATH)/Android.common.mk # includes strongswan_PATH := $(LOCAL_PATH) -libvstr_PATH := external/strongswan-support/vstr/include libcurl_PATH := external/strongswan-support/libcurl/include libgmp_PATH := external/strongswan-support/gmp openssl_PATH := external/openssl/include @@ -77,7 +76,7 @@ strongswan_CFLAGS := \ -DMONOLITHIC \ -DUSE_IKEV1 \ -DUSE_IKEV2 \ - -DUSE_VSTR \ + -DUSE_BUILTIN_PRINTF \ -DDEBUG \ -DROUTING_TABLE=0 \ -DROUTING_TABLE_PRIO=220 \ diff --git a/configure.ac b/configure.ac index 4d687cef77..660908ac3b 100644 --- a/configure.ac +++ b/configure.ac @@ -643,7 +643,7 @@ AC_CHECK_FUNC( if test x$vstr = xtrue; then AC_CHECK_LIB([vstr],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([Vstr string library not found])],[]) - AC_DEFINE([USE_VSTR], [], [use vstring library for printf hooks]) + AC_DEFINE([USE_VSTR], [], [use Vstr string library for printf hooks]) builtin_printf=false fi diff --git a/src/charon/Android.mk b/src/charon/Android.mk index 1dd27d5340..852d73c109 100644 --- a/src/charon/Android.mk +++ b/src/charon/Android.mk @@ -8,7 +8,6 @@ charon.c # build charon ----------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libhydra \ $(strongswan_PATH)/src/libcharon \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/frontends/android/README.ndk b/src/frontends/android/README.ndk index e1dbac39c8..699fa3f119 100644 --- a/src/frontends/android/README.ndk +++ b/src/frontends/android/README.ndk @@ -11,12 +11,3 @@ folder: built on Android (and especially in the NDK), we provide a modified mirror of the official Android OpenSSL version on git.strongswan.org. - - vstr: The Vstr string library. Since cross-compiling this library is not - that easy with the configure script and Makefiles included in the tarball, - the easiest way to build it is using either droid-gcc (as described on - wiki.strongswan.org) or a standalone toolchain built with the NDK. - The build script provided on the wiki builds the library with droid-gcc - and copies the required header files to the configured installation - directory. Please note that the Android.mk provided on the wiki (vstr.mk) - does not work in the NDK. A replacement is already in place in jni/vstr. - diff --git a/src/frontends/android/jni/.gitignore b/src/frontends/android/jni/.gitignore index 98094a88b5..ca5cf16ed0 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 de3403f3d0..8388436e5c 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 e4a6759744..f11b57ec6d 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 7dd8ad6774..fbe56d5b41 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 8e1c6850fd..0000000000 --- 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) diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk index 0fe88efb4e..cc52209739 100644 --- a/src/libcharon/Android.mk +++ b/src/libcharon/Android.mk @@ -217,7 +217,6 @@ endif # build libcharon -------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/include \ $(strongswan_PATH)/src/libhydra \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk index 429feed555..ff134da7bf 100644 --- a/src/libhydra/Android.mk +++ b/src/libhydra/Android.mk @@ -26,7 +26,6 @@ LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink) # build libhydra --------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/include \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/libimcv/Android.mk b/src/libimcv/Android.mk index db953d9551..ce13ea4725 100644 --- a/src/libimcv/Android.mk +++ b/src/libimcv/Android.mk @@ -46,7 +46,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libimcv_la_SOURCES)) # build libimcv ---------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libtncif \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/libipsec/Android.mk b/src/libipsec/Android.mk index 37f400fc30..c5d987977b 100644 --- a/src/libipsec/Android.mk +++ b/src/libipsec/Android.mk @@ -20,7 +20,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libipsec_la_SOURCES)) # build libipsec --------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/include \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/libpts/Android.mk b/src/libpts/Android.mk index 4eeab2fc8e..a191bba8d2 100644 --- a/src/libpts/Android.mk +++ b/src/libpts/Android.mk @@ -57,7 +57,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libpts_la_SOURCES)) # build libpts ----------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libtncif \ $(strongswan_PATH)/src/libimcv \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index 1a13fdd718..1b26157639 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -36,7 +36,7 @@ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \ utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \ -utils/printf_hook/printf_hook_vstr.c utils/settings.c +utils/printf_hook/printf_hook_builtin.c utils/settings.c # adding the plugin source files @@ -96,9 +96,6 @@ LOCAL_SRC_FILES += $(call add_plugin, xcbc) # build libstrongswan ---------------------------------------------------------- -LOCAL_C_INCLUDES += \ - $(libvstr_PATH) - LOCAL_CFLAGS := $(strongswan_CFLAGS) \ -include $(LOCAL_PATH)/AndroidConfigLocal.h @@ -110,6 +107,6 @@ LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES += libdl libvstr +LOCAL_SHARED_LIBRARIES += libdl include $(BUILD_SHARED_LIBRARY) diff --git a/src/libtnccs/Android.mk b/src/libtnccs/Android.mk index 4d2803a97a..68f85c252d 100644 --- a/src/libtnccs/Android.mk +++ b/src/libtnccs/Android.mk @@ -35,7 +35,6 @@ endif # build libtncif --------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libtls \ $(strongswan_PATH)/src/libtncif \ $(strongswan_PATH)/src/libstrongswan diff --git a/src/libtncif/Android.mk b/src/libtncif/Android.mk index 13ce6e11a8..36d3f4c33b 100644 --- a/src/libtncif/Android.mk +++ b/src/libtncif/Android.mk @@ -13,7 +13,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libtncif_la_SOURCES)) # build libtncif --------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libstrongswan LOCAL_CFLAGS := $(strongswan_CFLAGS) diff --git a/src/scepclient/Android.mk b/src/scepclient/Android.mk index 69413890f1..bec3d77ffb 100644 --- a/src/scepclient/Android.mk +++ b/src/scepclient/Android.mk @@ -10,7 +10,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(scepclient_SOURCES)) # build scepclient ------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libstrongswan LOCAL_CFLAGS := $(strongswan_CFLAGS) \ diff --git a/src/starter/Android.mk b/src/starter/Android.mk index 91575c9ba9..c2260be515 100644 --- a/src/starter/Android.mk +++ b/src/starter/Android.mk @@ -14,7 +14,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(starter_SOURCES)) # build starter ---------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libhydra \ $(strongswan_PATH)/src/libstrongswan \ $(strongswan_PATH)/src/stroke diff --git a/src/stroke/Android.mk b/src/stroke/Android.mk index 320314c4d4..2accb522da 100644 --- a/src/stroke/Android.mk +++ b/src/stroke/Android.mk @@ -10,7 +10,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(stroke_SOURCES)) # build stroke ----------------------------------------------------------------- LOCAL_C_INCLUDES += \ - $(libvstr_PATH) \ $(strongswan_PATH)/src/libstrongswan LOCAL_CFLAGS := $(strongswan_CFLAGS)