From 883d92f60869631fae50bdc4d21c9a4a05096d84 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 13 Jun 2014 14:59:23 +0200
Subject: [PATCH] Build the iSAC codec and the WebRTC echo canceller from the
 mswebrtc plugin.

---
 jni/Android.mk      | 40 ++++++++++++++++++----------------------
 jni/Application.mk  |  4 ++--
 submodules/linphone |  2 +-
 submodules/mswebrtc |  2 +-
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index c894f5d32..b1386f070 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -152,36 +152,32 @@ WEBRTC_BUILD_NEON_LIBS=false
 
 # AECM
 ifneq ($(BUILD_WEBRTC_AECM),0)
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+$(info $(TARGET_ARCH_ABI): Build NEON modules for AECM)
+WEBRTC_BUILD_NEON_LIBS=true
+endif
 
-        ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-            $(info $(TARGET_ARCH_ABI): Build NEON modules for AECM)
-            WEBRTC_BUILD_NEON_LIBS=true
-        endif
-
-        $(info $(TARGET_ARCH_ABI): Build AECM from WebRTC)
-
-        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
+$(info $(TARGET_ARCH_ABI): Build AECM from WebRTC)
+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
 
 # iSAC
 ifneq ($(BUILD_WEBRTC_ISAC),0)
+# don't build for neon in x86
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+$(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC)
+WEBRTC_BUILD_NEON_LIBS=true
+endif
 
-    # don't build for neon in x86
-    ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-        $(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC)
-        WEBRTC_BUILD_NEON_LIBS=true
-    endif
-
-     $(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2)
-     include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
-     include $(linphone-root-dir)/submodules/msisac/Android.mk
+$(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2)
+include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
 endif
 
 # common modules for ISAC and AECM
 ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
-    $(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)))
-    include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk
+$(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)))
+include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk
+include $(linphone-root-dir)/submodules/mswebrtc/Android.mk
 endif
-
diff --git a/jni/Application.mk b/jni/Application.mk
index 69de103f3..6ce48a283 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -100,14 +100,14 @@ APP_MODULES += libopus
 endif
 
 ifneq ($(BUILD_WEBRTC_AECM), 0)
-APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm
+APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm libmswebrtc
 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
+APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmswebrtc
 ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
 APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon
 endif
diff --git a/submodules/linphone b/submodules/linphone
index 8db55ea83..7caaca64f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 8db55ea83e5b275dd28bf7cb6199d2541c88db49
+Subproject commit 7caaca64ff3e96d202ad9192a0e6dbf76f9deecc
diff --git a/submodules/mswebrtc b/submodules/mswebrtc
index a106bde1d..0c9d65c32 160000
--- a/submodules/mswebrtc
+++ b/submodules/mswebrtc
@@ -1 +1 @@
-Subproject commit a106bde1dd8fb195b3ada76ebf01f2d2fa5872f9
+Subproject commit 0c9d65c32431969e58f77e0c280d7ce601ca043b