From 8eda5fc5dc4b733ffe3458600244d1f94cb6686b Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Thu, 20 Oct 2011 09:39:19 -0300 Subject: [PATCH] Disable ext/faad for the android ndk build It currently makes the build fail. Idea is to enable it back again once its building problems get sorted out. --- Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index fb349cf..d858ab8 100644 --- a/Android.mk +++ b/Android.mk @@ -70,8 +70,11 @@ GST_PLUGINS_BAD_BUILT_SOURCES := \ gst/stereo/Android.mk \ gst/rtpvp8/Android.mk \ gst/mpegdemux/Android.mk \ - gst/ivfparse/Android.mk \ - ext/faad/Android.mk + gst/ivfparse/Android.mk + +ifneq ($(NDK_BUILD), true) +GST_PLUGINS_BAD_BUILT_SOURCES += ext/faad/Android.mk +endif GST_PLUGINS_BAD_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BAD_TOP))/%, $(GST_PLUGINS_BAD_BUILT_SOURCES)) @@ -110,7 +113,9 @@ CONFIGURE_TARGETS += gst-plugins-bad-configure -include $(GST_PLUGINS_BAD_TOP)/gst/aiff/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/asfmux/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/videoparsers/Android.mk +ifneq ($(NDK_BUILD), true) -include $(GST_PLUGINS_BAD_TOP)/ext/faad/Android.mk +endif -include $(GST_PLUGINS_BAD_TOP)/gst/sdp/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/hls/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/jp2kdecimator/Android.mk -- 2.7.4