From 4c99a6f202570b1e41633df7bcf8223d1889c88f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 15 Nov 2013 17:18:09 +0100
Subject: [PATCH] enable webrtc aecm for android x86

---
 jni/Android.mk                               |  3 ---
 jni/Application.mk                           |  4 ++++
 project.properties                           |  2 +-
 submodules/externals/build/webrtc/Android.mk | 10 ++++++----
 submodules/linphone                          |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index c62e7e552..93612c289 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -147,8 +147,6 @@ WEBRTC_BUILD_NEON_LIBS=false
 # AECM
 ifneq ($(BUILD_WEBRTC_AECM),0)
 
-    ifneq ($(TARGET_ARCH), x86)
-
         ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
             $(info $(TARGET_ARCH_ABI): Build NEON modules for AECM)
             WEBRTC_BUILD_NEON_LIBS=true
@@ -159,7 +157,6 @@ ifneq ($(BUILD_WEBRTC_AECM),0)
         include $(linphone-root-dir)/submodules/externals/build/webrtc/system_wrappers/Android.mk
         include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk
         include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk
-    endif
 endif
 
 # iSAC
diff --git a/jni/Application.mk b/jni/Application.mk
index 36fe8b7fc..b645eaae9 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -92,13 +92,17 @@ endif
 
 ifneq ($(BUILD_WEBRTC_AECM), 0)
 APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm
+ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
 APP_MODULES += libwebrtc_spl_neon libwebrtc_aecm_neon
 endif
+endif
 
 ifeq ($(BUILD_WEBRTC_ISAC), 1)
 APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmsisac
+ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
 APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon
 endif
+endif
 
 ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
 ifeq ($(RING),yes)
diff --git a/project.properties b/project.properties
index 019cc5583..a2bff5858 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-18
 android.library=false
diff --git a/submodules/externals/build/webrtc/Android.mk b/submodules/externals/build/webrtc/Android.mk
index 71185c94d..75b856d6c 100644
--- a/submodules/externals/build/webrtc/Android.mk
+++ b/submodules/externals/build/webrtc/Android.mk
@@ -1,10 +1,12 @@
 MY_WEBRTC_COMMON_DEFS := \
     -DWEBRTC_ANDROID \
     -DWEBRTC_LINUX \
-    -DWEBRTC_CLOCK_TYPE_REALTIME \
-    -DWEBRTC_ARCH_ARM
+    -DWEBRTC_CLOCK_TYPE_REALTIME 
+
+ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
+MY_WEBRTC_COMMON_DEFS += -DWEBRTC_ARCH_ARM
+endif
 
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-MY_WEBRTC_COMMON_DEFS += \
-    -DWEBRTC_DETECT_ARM_NEON
+MY_WEBRTC_COMMON_DEFS += -DWEBRTC_DETECT_ARM_NEON
 endif
diff --git a/submodules/linphone b/submodules/linphone
index 0138897ef..244edb9b7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0138897ef049fbf124b9a324592877bfe47349b2
+Subproject commit 244edb9b71a5061f2d65eecd73c55bb48355710f