Updated Android build, fixing LINPHONE_VIDEO=0 issue

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index 3d72ffc5535492e369089129e363b71990ca36e5..d0c87b4f82bf15e0bf7e9e4b52616fd84c8befde 100644 (file)
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -26,11 +26,13 @@ include $(CLEAR_VARS)
 
 include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
+ifeq ($(LINPHONE_VIDEO),1)
 LOCAL_SHARED_LIBRARIES += \
        libavcodecnoneon \
        libswscale \
        libavcore \
        libavutil
+endif
 
 LOCAL_MODULE := liblinphonenoneon
 ifeq ($(TARGET_ARCH_ABI),armeabi)

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 549367611718be8b0bcee517e72fe6c09132fe48..b46664b61271898e0cc4ea2a45ec9c14ed72fdd8 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -26,11 +26,13 @@ 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