Commit a1ec7d69 authored by Simon Morlat's avatar Simon Morlat
Browse files

fix Android makefiles for audio build

parent 5c88a8dd
......@@ -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 \
......
......@@ -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 \
......
......@@ -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)
......
mediastreamer2 @ ac5233ae
Subproject commit 4d4137357d244681fcc714411345f77e03459bdf
Subproject commit ac5233ae16394d59cf4d9783a229f2adc2111b12
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment