Commit f444e2f5 authored by jehan's avatar jehan
Browse files

polarssl must be an option for Android build

parent f432326d
...@@ -25,13 +25,12 @@ include $(CLEAR_VARS) ...@@ -25,13 +25,12 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libbellesip LOCAL_MODULE := libbellesip
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-DHAVE_CONFIG_H \ -DHAVE_CONFIG_H
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../externals/antlr3/runtime/C/include \ $(LOCAL_PATH)/../../externals/antlr3/runtime/C/include \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../build/android \ $(LOCAL_PATH)/../build/android
$(LOCAL_PATH)/../../externals/polarssl/include
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
auth_event.c \ auth_event.c \
...@@ -67,13 +66,19 @@ LOCAL_SRC_FILES := \ ...@@ -67,13 +66,19 @@ LOCAL_SRC_FILES := \
transaction.c \ transaction.c \
transports/stream_channel.c \ transports/stream_channel.c \
transports/stream_listeningpoint.c \ transports/stream_listeningpoint.c \
transports/tls_channel_polarssl.c \
transports/tls_listeningpoint_polarssl.c \
transports/udp_channel.c \ transports/udp_channel.c \
transports/udp_listeningpoint.c transports/udp_listeningpoint.c
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
antlr3 \ antlr3
polarssl
ifeq ($(BUILD_TLS),1)
LOCAL_STATIC_LIBRARIES += polarssl
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../externals/polarssl/include
LOCAL_SRC_FILES += \
transports/tls_channel_polarssl.c \
transports/tls_listeningpoint_polarssl.c
LOCAL_CFLAGS += -DHAVE_POLARSSL=1
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
/* #undef HAVE_LIBRT */ /* #undef HAVE_LIBRT */
#define HAVE_POLARSSL 1
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment