diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2011-10-20 09:39:19 -0300 |
|---|---|---|
| committer | reynaldo <reynaldo@opendot.cl> | 2011-10-20 09:47:32 -0300 |
| commit | 8eda5fc5dc4b733ffe3458600244d1f94cb6686b (patch) | |
| tree | 00eda3c9c053cd14c09d19bf571a0a3501e4e697 | |
| parent | 4060056ce60325ec9737265d919db760833d7707 (diff) | |
| download | gstreamer-plugins-bad-8eda5fc5dc4b733ffe3458600244d1f94cb6686b.tar.gz | |
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.
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index fb349cf05..d858ab8ea 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 |