Renamed android libraries to avoid confusion

[linphone] / build / android / Android.mk

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 549367611718be8b0bcee517e72fe6c09132fe48..0dc0bd041fe283c94e62fdf9516692e8263dddb9 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -21,19 +21,24 @@
 
 LOCAL_PATH:= $(call my-dir)/../../coreapi
 
-
 include $(CLEAR_VARS)
 
 include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
+ifeq ($(LINPHONE_VIDEO),1)
 LOCAL_SHARED_LIBRARIES += \
        libavcodec \
        libswscale \
        libavcore \
        libavutil
+endif
 
 LOCAL_MODULE := liblinphone
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_MODULE_FILENAME := liblinphonearmv7
+endif
 
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)
+