From d5cee9f44dc7265b6f1c0b4df3f94c1055153aff Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 7 Jun 2012 09:35:01 +0200
Subject: [PATCH] Fix for ICS issue with native libs

---
 Makefile       | 1 -
 jni/Android.mk | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 256f3606c..78a934236 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,6 @@ prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-sr
 
 generate-libs: 
 	$(NDK_PATH)/ndk-build BUILD_SILK=1 -j$(NUMCPUS)
-	rm $(TOPDIR)/libs/armeabi/liblinphone.so
 
 update-project:
 	$(SDK_PATH)/android update project --path .
diff --git a/jni/Android.mk b/jni/Android.mk
index 766543a96..35e56b068 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -116,8 +116,9 @@ ifeq ($(BUILD_SRTP), 1)
 include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk
 endif
 
-
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
 include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
+endif
 include $(linphone-root-dir)/submodules/linphone/build/android/Android-no-neon.mk
 
 _BUILD_AMR=0