Merge remote-tracking branch 'origin/master' into 0.11

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

diff --git a/Android.mk b/Android.mk
index d6ca579..b42e34b 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -6,11 +6,8 @@ GST_PLUGINS_BASE_TOP := $(LOCAL_PATH)
 GST_PLUGINS_BASE_BUILT_SOURCES :=                                              \
        pkgconfig/gstreamer-app-0.10.pc                         \
        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                     \
        pkgconfig/gstreamer-plugins-base-0.10.pc                \
        pkgconfig/gstreamer-riff-0.10.pc                        \
@@ -21,11 +18,8 @@ GST_PLUGINS_BASE_BUILT_SOURCES :=                                            \
        pkgconfig/gstreamer-video-0.10.pc                       \
        pkgconfig/gstreamer-app-0.10-uninstalled.pc             \
        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         \
        pkgconfig/gstreamer-plugins-base-0.10-uninstalled.pc    \
        pkgconfig/gstreamer-riff-0.10-uninstalled.pc            \
@@ -42,7 +36,6 @@ GST_PLUGINS_BASE_BUILT_SOURCES :=                                             \
        gst-libs/gst/pbutils/Android.mk                         \
        gst-libs/gst/rtp/Android.mk                             \
        gst-libs/gst/rtsp/Android.mk                            \
-       gst-libs/gst/netbuffer/Android.mk                       \
        gst-libs/gst/sdp/Android.mk                             \
        gst-libs/gst/app/Android.mk                             \
        gst-libs/gst/fft/Android.mk                             \
@@ -63,9 +56,12 @@ GST_PLUGINS_BASE_BUILT_SOURCES :=                                            \
        gst/audiorate/Android.mk                                        \
        gst/volume/Android.mk                                   \
        tools/Android.mk                                        \
-       ext/vorbis/Android.mk                           \
        ext/ogg/Android.mk
 
+ifneq ($(NDK_BUILD), true)
+GST_PLUGINS_BASE_BUILT_SOURCES += ext/vorbis/Android.mk
+endif
+
 GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
 
 
@@ -101,7 +97,6 @@ CONFIGURE_TARGETS += gst-plugins-base-configure
 -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/pbutils/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/rtp/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/rtsp/Android.mk
--include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/netbuffer/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/sdp/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/app/Android.mk
 -include $(GST_PLUGINS_BASE_TOP)/gst/playback/Android.mk
@@ -121,5 +116,7 @@ CONFIGURE_TARGETS += gst-plugins-base-configure
 -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
+ifneq ($(NDK_BUILD), true)
 -include $(GST_PLUGINS_BASE_TOP)/ext/vorbis/Android.mk
+endif
 -include $(GST_PLUGINS_BASE_TOP)/tools/Android.mk