Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index eb3b374..4bfbe75 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES :=                                               \
        pkgconfig/gstreamer-audio-0.10.pc                       \
        pkgconfig/gstreamer-cdda-0.10.pc                        \
        pkgconfig/gstreamer-fft-0.10.pc                         \
-       pkgconfig/gstreamer-floatcast-0.10.pc                   \
        pkgconfig/gstreamer-interfaces-0.10.pc                  \
        pkgconfig/gstreamer-netbuffer-0.10.pc                   \
        pkgconfig/gstreamer-pbutils-0.10.pc                     \
@@ -23,7 +22,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES :=                                             \
        pkgconfig/gstreamer-audio-0.10-uninstalled.pc           \
        pkgconfig/gstreamer-cdda-0.10-uninstalled.pc            \
        pkgconfig/gstreamer-fft-0.10-uninstalled.pc             \
-       pkgconfig/gstreamer-floatcast-0.10-uninstalled.pc       \
        pkgconfig/gstreamer-interfaces-0.10-uninstalled.pc      \
        pkgconfig/gstreamer-netbuffer-0.10-uninstalled.pc       \
        pkgconfig/gstreamer-pbutils-0.10-uninstalled.pc         \
@@ -56,13 +54,14 @@ GST_PLUGINS_BASE_BUILT_SOURCES :=                                           \
        gst/audiotestsrc/Android.mk                             \
        gst/videotestsrc/Android.mk                             \
        gst/videoscale/Android.mk                               \
-       gst/ffmpegcolorspace/Android.mk                         \
+       gst/videoconvert/Android.mk                             \
        gst/videorate/Android.mk                                \
        gst/encoding/Android.mk                                 \
        gst/adder/Android.mk                                    \
        gst/audiorate/Android.mk                                        \
        gst/volume/Android.mk                                   \
        tools/Android.mk                                        \
+       ext/vorbis/Android.mk                           \
        ext/ogg/Android.mk
 
 GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
@@ -79,8 +78,10 @@ gst-plugins-base-configure:
        CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
        PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \
        PKG_CONFIG_TOP_BUILD_DIR=/ \
+       IVORBIS_CFLAGS="-I$(TOP)/external/tremolo -DTREMOR" \
+       IVORBIS_LIBS="-lvorbisidec" \
        $(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
-       --prefix=/system --disable-orc --disable-gio \
+       --prefix=/system --disable-orc --disable-gio --enable-ivorbis \
        --disable-valgrind --disable-gtk-doc && \
        for file in $(GST_PLUGINS_BASE_BUILT_SOURCES); do \
                rm -f $$file && \
@@ -111,11 +112,12 @@ CONFIGURE_TARGETS += gst-plugins-base-configure
 -include $(GST_PLUGINS_BASE_TOP)/gst/audiotestsrc/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/videotestsrc/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/videoscale/Android.mk
--include $(GST_PLUGINS_BASE_TOP)/gst/ffmpegcolorspace/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst/videoconvert/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/videorate/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/encoding/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/adder/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/audiorate/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/volume/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/ext/ogg/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/ext/vorbis/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/tools/Android.mk