From c97ea56bc43f7a49f670e02f20b754517bc51a0c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 14 May 2013 12:16:47 +0200
Subject: [PATCH] Renamed liblinphone libraries using target cpu and neon
 presence in names

---
 jni/Android.mk      | 6 +++---
 submodules/linphone | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 4bf687525..4f6f676c4 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -11,12 +11,12 @@ ifeq ($(BUILD_G729),)
 BUILD_G729=0
 endif
 BUILD_SRTP=1
+
+BUILD_X264=0
+LINPHONE_VIDEO=0
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 BUILD_X264=1
 LINPHONE_VIDEO=1
-else
-LINPHONE_VIDEO=0
-BUILD_X264=0
 endif
 
 include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
diff --git a/submodules/linphone b/submodules/linphone
index ca42ee87d..66dd5cec6 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498
+Subproject commit 66dd5cec662d83030955966da96bb6addcde55f1