Renamed liblinphone for armv5 + fix compilation issue

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index 970e8bc8a2f2b41eb173e28d0cbffdb849abbe13..3d72ffc5535492e369089129e363b71990ca36e5 100644 (file)
--- 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 903a05169907f9bd9a045727d31962b2d825e349..549367611718be8b0bcee517e72fe6c09132fe48 100755 (executable)
--- 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)