From a1ec7d69658b8b534a9c5b6ca446dddd82442b41 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 16 Sep 2013 16:48:20 +0200 Subject: [PATCH] fix Android makefiles for audio build --- build/android/Android-no-neon.mk | 2 +- build/android/Android.mk | 2 +- build/android/common.mk | 9 +++------ mediastreamer2 | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk index c1f9e7f05..79b58baaf 100644 --- a/build/android/Android-no-neon.mk +++ b/build/android/Android-no-neon.mk @@ -25,7 +25,7 @@ include $(CLEAR_VARS) include $(linphone-root-dir)/submodules/linphone/build/android/common.mk -ifeq ($(LINPHONE_VIDEO),1) +ifeq ($(_BUILD_VIDEO),1) LOCAL_SHARED_LIBRARIES += \ liblinavcodecnoneon \ liblinswscale \ diff --git a/build/android/Android.mk b/build/android/Android.mk index 645676ffc..2b2389fc8 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -25,7 +25,7 @@ include $(CLEAR_VARS) include $(linphone-root-dir)/submodules/linphone/build/android/common.mk -ifeq ($(LINPHONE_VIDEO),1) +ifeq ($(_BUILD_VIDEO),1) LOCAL_SHARED_LIBRARIES += \ liblinavcodec \ liblinswscale \ diff --git a/build/android/common.mk b/build/android/common.mk index 48047d67b..4e6efdd7d 100644 --- a/build/android/common.mk +++ b/build/android/common.mk @@ -74,14 +74,11 @@ LOCAL_CFLAGS += \ LOCAL_CFLAGS += -DIN_LINPHONE -ifeq ($(LINPHONE_VIDEO),1) -LOCAL_CFLAGS += -DVIDEO_ENABLED +ifeq ($(_BUILD_VIDEO),1) +LOCAL_CFLAGS += -DVIDEO_ENABLED -DENABLE_HD ifeq ($(BUILD_X264),1) LOCAL_CFLAGS += -DHAVE_X264 endif -ifeq ($(LINPHONE_HD_VIDEO),1) -LOCAL_CFLAGS += -DENABLE_HD -endif endif ifeq ($(USE_JAVAH),1) @@ -157,7 +154,7 @@ LOCAL_SHARED_LIBRARIES += libbcg729 LOCAL_STATIC_LIBRARIES += libmsbcg729 endif -ifeq ($(LINPHONE_VIDEO),1) +ifeq ($(_BUILD_VIDEO),1) LOCAL_LDLIBS += -lGLESv2 LOCAL_STATIC_LIBRARIES += libvpx ifeq ($(BUILD_X264),1) diff --git a/mediastreamer2 b/mediastreamer2 index 4d4137357..ac5233ae1 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 4d4137357d244681fcc714411345f77e03459bdf +Subproject commit ac5233ae16394d59cf4d9783a229f2adc2111b12