atomics: Use type of destination in CAS implementation

[thirdparty/strongswan.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index b17a3f633f206716d4acc65cec11a196a42005bf..0ca462ee3621c2ad3add397e252f7ac1ad5b3aeb 100644 (file)
--- 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
@@ -61,16 +60,12 @@ strongswan_CFLAGS := \
        -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 \
-       -DOPENSSL_NO_CMS \
-       -DOPENSSL_NO_EC \
-       -DOPENSSL_NO_ECDSA \
-       -DOPENSSL_NO_ECDH \
        -DOPENSSL_NO_ENGINE \
        -DCONFIG_H_INCLUDED \
        -DCAPABILITIES \
@@ -78,7 +73,7 @@ strongswan_CFLAGS := \
        -DMONOLITHIC \
        -DUSE_IKEV1 \
        -DUSE_IKEV2 \
-       -DUSE_VSTR \
+       -DUSE_BUILTIN_PRINTF \
        -DDEBUG \
        -DROUTING_TABLE=0 \
        -DROUTING_TABLE_PRIO=220 \
@@ -98,10 +93,11 @@ strongswan_CFLAGS += \
 strongswan_BUILD := \
        charon \
        libcharon \
-       libhydra \
        libstrongswan \
        libtncif \
-       libtnccs
+       libtnccs \
+       libimcv \
+       libtpmtss
 
 ifneq ($(strongswan_BUILD_STARTER),)
 strongswan_BUILD += \