projects / platform / upstream / gstreamer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rtsprange: use gst_util_gdouble_to_guint64 in get_seconds
[platform/upstream/gstreamer.git] / Android.mk
diff --git a/Android.mk b/Android.mk
index 4bfbe75..4b42d7a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,34 +4,30 @@ include $(CLEAR_VARS)
 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-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                        \
-       pkgconfig/gstreamer-rtp-0.10.pc                         \
-       pkgconfig/gstreamer-rtsp-0.10.pc                        \
-       pkgconfig/gstreamer-sdp-0.10.pc                         \
-       pkgconfig/gstreamer-tag-0.10.pc                         \
-       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-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            \
-       pkgconfig/gstreamer-rtp-0.10-uninstalled.pc             \
-       pkgconfig/gstreamer-rtsp-0.10-uninstalled.pc            \
-       pkgconfig/gstreamer-sdp-0.10-uninstalled.pc             \
-       pkgconfig/gstreamer-tag-0.10-uninstalled.pc             \
-       pkgconfig/gstreamer-video-0.10-uninstalled.pc           \
+       pkgconfig/gstreamer-app-1.0.pc                          \
+       pkgconfig/gstreamer-audio-1.0.pc                        \
+       pkgconfig/gstreamer-fft-1.0.pc                          \
+       pkgconfig/gstreamer-interfaces-1.0.pc                   \
+       pkgconfig/gstreamer-pbutils-1.0.pc                      \
+       pkgconfig/gstreamer-plugins-base-1.0.pc         \
+       pkgconfig/gstreamer-riff-1.0.pc                 \
+       pkgconfig/gstreamer-rtp-1.0.pc                          \
+       pkgconfig/gstreamer-rtsp-1.0.pc                 \
+       pkgconfig/gstreamer-sdp-1.0.pc                          \
+       pkgconfig/gstreamer-tag-1.0.pc                          \
+       pkgconfig/gstreamer-video-1.0.pc                        \
+       pkgconfig/gstreamer-app-1.0-uninstalled.pc              \
+       pkgconfig/gstreamer-audio-1.0-uninstalled.pc            \
+       pkgconfig/gstreamer-fft-1.0-uninstalled.pc              \
+       pkgconfig/gstreamer-interfaces-1.0-uninstalled.pc       \
+       pkgconfig/gstreamer-pbutils-1.0-uninstalled.pc          \
+       pkgconfig/gstreamer-plugins-base-1.0-uninstalled.pc     \
+       pkgconfig/gstreamer-riff-1.0-uninstalled.pc             \
+       pkgconfig/gstreamer-rtp-1.0-uninstalled.pc              \
+       pkgconfig/gstreamer-rtsp-1.0-uninstalled.pc             \
+       pkgconfig/gstreamer-sdp-1.0-uninstalled.pc              \
+       pkgconfig/gstreamer-tag-1.0-uninstalled.pc              \
+       pkgconfig/gstreamer-video-1.0-uninstalled.pc            \
        gst-libs/gst/interfaces/Android.mk                      \
        gst-libs/gst/tag/Android.mk                             \
        gst-libs/gst/audio/Android.mk                           \
@@ -40,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                             \
@@ -61,9 +56,13 @@ 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
+ZLIB_CFLAGS = -I $(abspath $(GST_PLUGINS_BASE_TOP)/../../zlib)
+endif
+
 GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
 
 
@@ -80,6 +79,7 @@ gst-plugins-base-configure:
        PKG_CONFIG_TOP_BUILD_DIR=/ \
        IVORBIS_CFLAGS="-I$(TOP)/external/tremolo -DTREMOR" \
        IVORBIS_LIBS="-lvorbisidec" \
+       ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \
        $(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
        --prefix=/system --disable-orc --disable-gio --enable-ivorbis \
        --disable-valgrind --disable-gtk-doc && \
@@ -99,7 +99,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
@@ -119,5 +118,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
Domain: Multimedia / Media Common;