android: Remove dependency on libvstr

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.
-

src/frontends/android/jni/.gitignore

@@ -1,4 +1,2 @@
 openssl
 strongswan
-vstr/include
-vstr/*/libvstr.a

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 \

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

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 \

src/frontends/android/jni/vstr/Android.mk

@@ -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)