From da4114607f0d080efb9bcee2fa0dbcc94a2f0d17 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 12 Sep 2012 21:17:29 +0200 Subject: [PATCH] Updated Android build, fixing LINPHONE_VIDEO=0 issue --- build/android/Android-no-neon.mk | 2 ++ build/android/Android.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk index 3d72ffc5..d0c87b4f 100644 --- 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 54936761..b46664b6 100755 --- 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 -- 2.39.2