From 8df7709ac98586ed2f1be6de54f18b25bc9d8168 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pelloux@gmail.com>
Date: Tue, 3 Apr 2012 15:02:42 +0200
Subject: [PATCH] Fix Android build

---
 submodules/externals/build/libvpx/Android.mk | 5 ++++-
 submodules/linphone                          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/submodules/externals/build/libvpx/Android.mk b/submodules/externals/build/libvpx/Android.mk
index 4bbe093d8..54881e091 100755
--- a/submodules/externals/build/libvpx/Android.mk
+++ b/submodules/externals/build/libvpx/Android.mk
@@ -7,7 +7,7 @@ LOCAL_MODULE := libvpx
 LOCAL_CFLAGS := -O3 -fPIC -D_FORTIFY_SOURCE=0 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement -Wdisabled-optimization -Wpointer-arith -Wtype-limits -Wcast-qual -Wno-unused-function
 
 LOCAL_ARM_MODE := arm
-ASM := .s
+ASM := .asm.s
 
 
 ### vpx_mem.mk
@@ -239,4 +239,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/vp8 \
 	$(LOCAL_PATH)/vpx_codec
 
+LOCAL_STATIC_LIBRARIES += cpufeatures
+
 include $(BUILD_STATIC_LIBRARY)
+$(call import-module,android/cpufeatures)
diff --git a/submodules/linphone b/submodules/linphone
index 6e0a681c9..cc40a4f2a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6e0a681c9ebabf88ef55c49b3db79cdf68dd7f76
+Subproject commit cc40a4f2a7f6fc6eab689208804868d836ddcd8e