diff options
author | Reynaldo H. Verdejo Pinochet | 2011-10-20 07:39:19 -0500 |
---|---|---|
committer | reynaldo | 2011-10-20 07:47:32 -0500 |
commit | 8eda5fc5dc4b733ffe3458600244d1f94cb6686b (patch) | |
tree | 00eda3c9c053cd14c09d19bf571a0a3501e4e697 /Android.mk | |
parent | 4060056ce60325ec9737265d919db760833d7707 (diff) | |
download | gst-plugins-bad0-10-8eda5fc5dc4b733ffe3458600244d1f94cb6686b.tar.gz gst-plugins-bad0-10-8eda5fc5dc4b733ffe3458600244d1f94cb6686b.tar.xz gst-plugins-bad0-10-8eda5fc5dc4b733ffe3458600244d1f94cb6686b.zip |
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.
Diffstat (limited to 'Android.mk')
-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 := \ | |||
70 | gst/stereo/Android.mk \ | 70 | gst/stereo/Android.mk \ |
71 | gst/rtpvp8/Android.mk \ | 71 | gst/rtpvp8/Android.mk \ |
72 | gst/mpegdemux/Android.mk \ | 72 | gst/mpegdemux/Android.mk \ |
73 | gst/ivfparse/Android.mk \ | 73 | gst/ivfparse/Android.mk |
74 | ext/faad/Android.mk | 74 | |
75 | ifneq ($(NDK_BUILD), true) | ||
76 | GST_PLUGINS_BAD_BUILT_SOURCES += ext/faad/Android.mk | ||
77 | endif | ||
75 | 78 | ||
76 | GST_PLUGINS_BAD_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BAD_TOP))/%, $(GST_PLUGINS_BAD_BUILT_SOURCES)) | 79 | GST_PLUGINS_BAD_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BAD_TOP))/%, $(GST_PLUGINS_BAD_BUILT_SOURCES)) |
77 | 80 | ||
@@ -110,7 +113,9 @@ CONFIGURE_TARGETS += gst-plugins-bad-configure | |||
110 | -include $(GST_PLUGINS_BAD_TOP)/gst/aiff/Android.mk | 113 | -include $(GST_PLUGINS_BAD_TOP)/gst/aiff/Android.mk |
111 | -include $(GST_PLUGINS_BAD_TOP)/gst/asfmux/Android.mk | 114 | -include $(GST_PLUGINS_BAD_TOP)/gst/asfmux/Android.mk |
112 | -include $(GST_PLUGINS_BAD_TOP)/gst/videoparsers/Android.mk | 115 | -include $(GST_PLUGINS_BAD_TOP)/gst/videoparsers/Android.mk |
116 | ifneq ($(NDK_BUILD), true) | ||
113 | -include $(GST_PLUGINS_BAD_TOP)/ext/faad/Android.mk | 117 | -include $(GST_PLUGINS_BAD_TOP)/ext/faad/Android.mk |
118 | endif | ||
114 | -include $(GST_PLUGINS_BAD_TOP)/gst/sdp/Android.mk | 119 | -include $(GST_PLUGINS_BAD_TOP)/gst/sdp/Android.mk |
115 | -include $(GST_PLUGINS_BAD_TOP)/gst/hls/Android.mk | 120 | -include $(GST_PLUGINS_BAD_TOP)/gst/hls/Android.mk |
116 | -include $(GST_PLUGINS_BAD_TOP)/gst/jp2kdecimator/Android.mk | 121 | -include $(GST_PLUGINS_BAD_TOP)/gst/jp2kdecimator/Android.mk |