NEWS: Some minor updates

[strongswan.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 663b363..0ca462e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -17,12 +17,12 @@ include $(CLEAR_VARS)
 # this is the list of plugins that are built into libstrongswan and charon
 # also these plugins are loaded by default (if not changed in strongswan.conf)
 strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \
 # this is the list of plugins that are built into libstrongswan and charon
 # also these plugins are loaded by default (if not changed in strongswan.conf)
 strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \

-       pkcs1 pkcs8 pem xcbc hmac kernel-netlink socket-default android \
+       pkcs1 pkcs8 pem xcbc hmac kernel-netlink socket-default android-dns \

        stroke eap-identity eap-mschapv2 eap-md5 eap-gtc
 
 ifneq ($(strongswan_BUILD_SCEPCLIENT),)
 # plugins loaded by scepclient
        stroke eap-identity eap-mschapv2 eap-md5 eap-gtc
 
 ifneq ($(strongswan_BUILD_SCEPCLIENT),)
 # plugins loaded by scepclient

-strongswan_SCEPCLIENT_PLUGINS := openssl curl fips-prf random pkcs1 pem
+strongswan_SCEPCLIENT_PLUGINS := openssl curl fips-prf random pkcs1 pkcs7 pem

 endif
 
 strongswan_STARTER_PLUGINS := kernel-netlink
 endif
 
 strongswan_STARTER_PLUGINS := kernel-netlink


@@ -36,7 +36,6 @@ include $(LOCAL_PATH)/Android.common.mk
 
 # includes
 strongswan_PATH := $(LOCAL_PATH)
 
 # 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
 libcurl_PATH := external/strongswan-support/libcurl/include
 libgmp_PATH := external/strongswan-support/gmp
 openssl_PATH := external/openssl/include


@@ -61,15 +60,12 @@ strongswan_CFLAGS := \
        -DHAVE_ALLOCA_H \
        -DHAVE_ALLOCA \
        -DHAVE_CLOCK_GETTIME \
        -DHAVE_ALLOCA_H \
        -DHAVE_ALLOCA \
        -DHAVE_CLOCK_GETTIME \

-       -DHAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC \
+       -DHAVE_DLADDR \

        -DHAVE_PRCTL \
        -DHAVE_LINUX_UDP_H \
        -DHAVE_STRUCT_SADB_X_POLICY_SADB_X_POLICY_PRIORITY \
        -DHAVE_IPSEC_MODE_BEET \
        -DHAVE_IPSEC_DIR_FWD \
        -DHAVE_PRCTL \
        -DHAVE_LINUX_UDP_H \
        -DHAVE_STRUCT_SADB_X_POLICY_SADB_X_POLICY_PRIORITY \
        -DHAVE_IPSEC_MODE_BEET \
        -DHAVE_IPSEC_DIR_FWD \

-       -DOPENSSL_NO_EC \
-       -DOPENSSL_NO_ECDSA \
-       -DOPENSSL_NO_ECDH \

        -DOPENSSL_NO_ENGINE \
        -DCONFIG_H_INCLUDED \
        -DCAPABILITIES \
        -DOPENSSL_NO_ENGINE \
        -DCONFIG_H_INCLUDED \
        -DCAPABILITIES \


@@ -77,7 +73,7 @@ strongswan_CFLAGS := \
        -DMONOLITHIC \
        -DUSE_IKEV1 \
        -DUSE_IKEV2 \
        -DMONOLITHIC \
        -DUSE_IKEV1 \
        -DUSE_IKEV2 \

-       -DUSE_VSTR \
+       -DUSE_BUILTIN_PRINTF \

        -DDEBUG \
        -DROUTING_TABLE=0 \
        -DROUTING_TABLE_PRIO=220 \
        -DDEBUG \
        -DROUTING_TABLE=0 \
        -DROUTING_TABLE_PRIO=220 \


@@ -97,10 +93,11 @@ strongswan_CFLAGS += \
 strongswan_BUILD := \
        charon \
        libcharon \
 strongswan_BUILD := \
        charon \
        libcharon \

-       libhydra \

        libstrongswan \
        libtncif \
        libstrongswan \
        libtncif \

-       libtnccs
+       libtnccs \
+       libimcv \
+       libtpmtss

 
 ifneq ($(strongswan_BUILD_STARTER),)
 strongswan_BUILD += \
 
 ifneq ($(strongswan_BUILD_STARTER),)
 strongswan_BUILD += \