From 4c34a2c7985afd12a39352ad812a6347accf498a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 23 Sep 2013 13:50:34 +0200
Subject: [PATCH] Build video support on x86 platform.

---
 build/android/Android-no-neon.mk |  5 ++---
 build/android/Android.mk         |  3 +++
 build/android/common.mk          | 12 ++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index 79b58baaf..641f3140b 100644
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -23,6 +23,7 @@ LOCAL_PATH:= $(call my-dir)/../../coreapi
 
 include $(CLEAR_VARS)
 
+ifeq ($(TARGET_ARCH), arm)
 include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
 ifeq ($(_BUILD_VIDEO),1)
@@ -32,6 +33,7 @@ LOCAL_SHARED_LIBRARIES += \
 	liblinavcore \
 	liblinavutil
 endif
+endif
 
 LOCAL_MODULE := liblinphonenoneon
 ifeq ($(TARGET_ARCH_ABI),armeabi)
@@ -40,9 +42,6 @@ endif
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
 endif
-ifeq ($(TARGET_ARCH_ABI),x86)
-LOCAL_MODULE_FILENAME := liblinphonex86
-endif
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 2b2389fc8..bd3fc6133 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -37,6 +37,9 @@ LOCAL_MODULE := liblinphone
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_MODULE_FILENAME := liblinphonearmv7
 endif
+ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_MODULE_FILENAME := liblinphonex86
+endif
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/build/android/common.mk b/build/android/common.mk
index 4e6efdd7d..f5dba448c 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -184,6 +184,7 @@ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
 LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
 LOCAL_SRC_FILES  += $(LIBLINPHONE_EXTENDED_SRC_FILES)
 
+ifeq ($(TARGET_ARCH), arm)
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 	ifeq ($(BUILD_GPLV3_ZRTP),1)
 		LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
@@ -207,6 +208,17 @@ else
 		LOCAL_STATIC_LIBRARIES += libsrtp-static
 	endif
 endif
+endif
+ifeq ($(TARGET_ARCH), x86)
+	ifeq ($(BUILD_GPLV3_ZRTP),1)
+		LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
+		LOCAL_SHARED_LIBRARIES += libzrtpcpp
+	endif
+
+	ifeq ($(BUILD_SRTP),1)
+	LOCAL_SHARED_LIBRARIES += libsrtp
+	endif
+endif
 
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
 LOCAL_SRC_FILES += 	../tools/xml2lpc.c \