From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 23 May 2012 15:37:01 +0000 (+0200)
Subject: Renamed liblinphone for armv5 + fix compilation issue
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=cd96b8ba6695890d61f55b3b070b09265d4e2b37

Renamed liblinphone for armv5 + fix compilation issue
---

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index 970e8bc8..3d72ffc5 100644
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -28,11 +28,15 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
 LOCAL_SHARED_LIBRARIES += \
 	libavcodecnoneon \
-	libswscalenoneon \
-	libavcorenoneon \
-	libavutilnoneon
+	libswscale \
+	libavcore \
+	libavutil
 
 LOCAL_MODULE := liblinphonenoneon
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+LOCAL_MODULE_FILENAME := liblinphonearmv5
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 903a0516..54936761 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -26,7 +26,14 @@ include $(CLEAR_VARS)
 
 include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
+LOCAL_SHARED_LIBRARIES += \
+	libavcodec \
+	libswscale \
+	libavcore \
+	libavutil
+
 LOCAL_MODULE := liblinphone
+
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)