gdp: add a GstDPPacketizer object, and create/free functions

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

diff --git a/Android.mk b/Android.mk
index 3b1c7a5..59f96e1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,8 @@ include $(CLEAR_VARS)
 GST_PLUGINS_BAD_TOP := $(LOCAL_PATH)
 
 GST_PLUGINS_BAD_BUILT_SOURCES := \
-       pkgconfig/gstreamer-plugins-bad-0.10-uninstalled.pc     \
-       pkgconfig/gstreamer-plugins-bad-0.10.pc \
+       pkgconfig/gstreamer-plugins-bad-1.0-uninstalled.pc      \
+       pkgconfig/gstreamer-plugins-bad-1.0.pc \
        gst-libs/gst/baseparse/Android.mk \
        gst-libs/gst/basecamerabinsrc/Android.mk \
        gst-libs/gst/codecparsers/Android.mk \
@@ -42,7 +42,6 @@ GST_PLUGINS_BAD_BUILT_SOURCES := \
        gst/mxf/Android.mk \
        gst/cdxaparse/Android.mk \
        gst/mpegpsmux/Android.mk \
-       gst/legacyresample/Android.mk \
        gst/gaudieffects/Android.mk \
        gst/liveadder/Android.mk \
        gst/nsf/Android.mk \
@@ -72,9 +71,8 @@ GST_PLUGINS_BAD_BUILT_SOURCES := \
        gst/mpegdemux/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 += ext/faac/Android.mk
 
 GST_PLUGINS_BAD_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BAD_TOP))/%, $(GST_PLUGINS_BAD_BUILT_SOURCES))
 
@@ -114,9 +112,8 @@ 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)/ext/faac/Android.mk
 -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
@@ -139,7 +136,6 @@ endif
 -include $(GST_PLUGINS_BAD_TOP)/gst/mxf/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/cdxaparse/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/mpegpsmux/Android.mk
--include $(GST_PLUGINS_BAD_TOP)/gst/legacyresample/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/gaudieffects/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/liveadder/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/nsf/Android.mk