android: make it ready for androgenizer

Remove the android/ top dir
Fixe the Makefile.am to be androgenized

To build gstreamer for android we are now using androgenizer which generates the
needed Android.mk files.
Androgenizer can be found here:
http://git.collabora.co.uk/?p=user/derek/androgenizer.git

Android.mk

 LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
 
-GSTREAMER_TOP := $(LOCAL_PATH)
+GST_PLUGINS_BASE_TOP := $(LOCAL_PATH)
 
-include $(CLEAR_VARS)
+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			\
+	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-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		\
+	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		\
+	gst-libs/gst/interfaces/Android.mk			\
+	gst-libs/gst/tag/Android.mk				\
+	gst-libs/gst/audio/Android.mk				\
+	gst-libs/gst/video/Android.mk				\
+	gst-libs/gst/riff/Android.mk				\
+	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				\
+	gst/playback/Android.mk					\
+	gst/typefind/Android.mk					\
+	gst/app/Android.mk					\
+	gst/gdp/Android.mk					\
+	gst/tcp/Android.mk					\
+	gst/audioconvert/Android.mk				\
+	gst/audioresample/Android.mk				\
+	gst/audiotestsrc/Android.mk				\
+	gst/videotestsrc/Android.mk				\
+	gst/videoscale/Android.mk				\
+	gst/ffmpegcolorspace/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/ogg/Android.mk
+
+GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
+
+
+.PHONY: gst-plugins-base-configure
+gst-plugins-base-configure:
+	cd $(GST_PLUGINS_BASE_TOP) ; \
+	CC="$(CONFIGURE_CC)" \
+	CFLAGS="$(CONFIGURE_CFLAGS)" \
+	LD=$(TARGET_LD) \
+	LDFLAGS="$(CONFIGURE_LDFLAGS)" \
+	CPP=$(CONFIGURE_CPP) \
+	CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+	PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \
+	PKG_CONFIG_TOP_BUILD_DIR=/ \
+	$(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
+	--prefix=/system --disable-orc --disable-gio \
+	--disable-valgrind --disable-gtk-doc && \
+	for file in $(GST_PLUGINS_BASE_BUILT_SOURCES); do \
+		rm -f $$file && \
+		make -C $$(dirname $$file) $$(basename $$file) ; \
+	done
 
-include $(GSTREAMER_TOP)/android/tag.mk
-include $(GSTREAMER_TOP)/android/audio.mk
-include $(GSTREAMER_TOP)/android/video.mk
-include $(GSTREAMER_TOP)/android/riff.mk
-include $(GSTREAMER_TOP)/android/interfaces.mk
-include $(GSTREAMER_TOP)/android/pbutils.mk
-include $(GSTREAMER_TOP)/android/rtp.mk
-include $(GSTREAMER_TOP)/android/rtsp.mk
-include $(GSTREAMER_TOP)/android/netbuffer.mk
-include $(GSTREAMER_TOP)/android/sdp.mk
-include $(GSTREAMER_TOP)/android/app.mk
-#plugins
-include $(GSTREAMER_TOP)/android/alsa.mk
-include $(GSTREAMER_TOP)/android/decodebin.mk
-include $(GSTREAMER_TOP)/android/decodebin2.mk
-#include $(GSTREAMER_TOP)/android/queue2.mk
-include $(GSTREAMER_TOP)/android/playbin.mk
-include $(GSTREAMER_TOP)/android/typefindfunctions.mk
-include $(GSTREAMER_TOP)/android/app_plugin.mk
-include $(GSTREAMER_TOP)/android/gdp.mk
-include $(GSTREAMER_TOP)/android/tcp.mk
-include $(GSTREAMER_TOP)/android/audioconvert.mk
+CONFIGURE_TARGETS += gst-plugins-base-configure
 
+-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/interfaces/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/fft/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/tag/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/audio/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/video/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst-libs/gst/riff/Android.mk
+-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
+-include $(GST_PLUGINS_BASE_TOP)/gst/typefind/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst/app/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst/gdp/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst/tcp/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst/audioconvert/Android.mk
+-include $(GST_PLUGINS_BASE_TOP)/gst/audioresample/Android.mk
+-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/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)/tools/Android.mk

android/alsa.mk

@@ -32,22 +32,8 @@ LOCAL_MODULE:= libgstalsa
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libasound
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../ext/alsa 			\
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)/..         			\
-    $(LOCAL_PATH)   	  				\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include 			\
-    external/alsa-lib/include      
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	-DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H	-DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #

android/app.mk

@@ -14,12 +14,10 @@ LOCAL_ARM_MODE := arm
 app_LOCAL_SRC_FILES_BASE:= \
 	gst-libs/gst/app/gstappsrc.c \
 	gst-libs/gst/app/gstappbuffer.c \
-	gst-libs/gst/app/gstappsink.c 
-app_LOCAL_SRC_FILES_ANDROID:= \
+	gst-libs/gst/app/gstappsink.c  \
 	gst-libs/gst/app/gstapp-marshal.c
   	
-LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE)) \
-				  $(addprefix ../android/,$(app_LOCAL_SRC_FILES_ANDROID))
+LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE))
 
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.10       \
@@ -31,23 +29,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstapp-0.10
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst-libs/gst/app   \
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)/..         			\
-    $(LOCAL_PATH)   	  				\
-	$(LOCAL_PATH)/gst-libs/gst/app 		\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	 -DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H	 -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -55,5 +38,6 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_COPY_HEADERS_TO := $(gst_app_COPY_HEADERS_TO)
 LOCAL_COPY_HEADERS := $(gst_app_COPY_HEADERS)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/app_plugin.mk

@@ -20,22 +20,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstapp
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/app  			\
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)/..         			\
-    $(LOCAL_PATH)   	  				\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	 -DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H	 -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -43,5 +29,6 @@ LOCAL_PRELINK_MODULE := false
 
 #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/audio.mk

@@ -12,13 +12,10 @@ gst_audio_COPY_HEADERS_BASE := \
 	gst-libs/gst/audio/gstbaseaudiosrc.h \
 	gst-libs/gst/audio/gstringbuffer.h \
 	gst-libs/gst/audio/mixerutils.h \
-	gst-libs/gst/audio/multichannel.h
-
-gst_audio_COPY_HEADERS_ANDROID := \
+	gst-libs/gst/audio/multichannel.h \
 	gst-libs/gst/audio/audio-enumtypes.h 
 
 gst_audio_COPY_HEADERS := $(addprefix ../,$(gst_audio_COPY_HEADERS_BASE)) \
-	          			  $(addprefix ../android/,$(gst_audio_COPY_HEADERS_ANDROID))
 
 include $(CLEAR_VARS)
 
@@ -36,12 +33,10 @@ audio_LOCAL_SRC_FILES_BASE:= \
 	gst-libs/gst/audio/gstaudiosrc.c \
 	gst-libs/gst/audio/gstbaseaudiosink.c \
 	gst-libs/gst/audio/gstbaseaudiosrc.c \
-	gst-libs/gst/audio/gstringbuffer.c 
-audio_LOCAL_SRC_FILES_ANDROID:= \
+	gst-libs/gst/audio/gstringbuffer.c  \
 	gst-libs/gst/audio/audio-enumtypes.c
         
-LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE)) \
-				  $(addprefix ../android/,$(audio_LOCAL_SRC_FILES_ANDROID))
+LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE))
 
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.10       \
@@ -54,23 +49,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstaudio-0.10
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst-libs/gst/audio \
-    $(LOCAL_PATH)/../gst-libs           \
-    $(LOCAL_PATH)/..            		\
-    $(LOCAL_PATH)      			 		\
-	$(LOCAL_PATH)/gst-libs/gst/audio   	\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	-DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H	-DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -78,5 +58,6 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_COPY_HEADERS_TO := $(gst_audio_COPY_HEADERS_TO)
 LOCAL_COPY_HEADERS := $(gst_audio_COPY_HEADERS)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/audioconvert.mk

@@ -7,6 +7,7 @@ LOCAL_ARM_MODE := arm
 audioconvert_LOCAL_SRC_FILES:= \
 	gst/audioconvert/gstaudioconvert.c \
 	gst/audioconvert/audioconvert.c \
+	gst/audioconvert/gstaudioconvertorc-dist.c \
 	gst/audioconvert/gstchannelmix.c \
 	gst/audioconvert/gstaudioquantize.c \
 	gst/audioconvert/plugin.c 
@@ -25,23 +26,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstaudioconvert
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/audioconvert   \
-    $(LOCAL_PATH)/..         	  		\
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)      			 		\
-	$(LOCAL_PATH)/gst-libs/gst/audio    \
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID	
+LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -49,5 +35,6 @@ LOCAL_PRELINK_MODULE := false
 
 #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/audioresample.mk

+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+audioresample_LOCAL_SRC_FILES:= \
+	gst/audioresample/gstaudioresample.c \
+	gst/audioresample/resample.c \
+	gst/audioresample/speex_resampler_float.c \
+	gst/audioresample/speex_resampler_double.c
+
+audioresample_C_INCLUDES := $(LOCAL_PATH)/ \
+
+LOCAL_SRC_FILES := $(addprefix ../,$(audioresample_LOCAL_SRC_FILES))
+LOCAL_C_INCLUDES := $(audioresample_C_INCLUDES)
+ 
+LOCAL_SHARED_LIBRARIES := \
+    libgstaudio-0.10        \
+    libgstreamer-0.10       \
+    libgstbase-0.10         \
+    libglib-2.0             \
+    libgthread-2.0          \
+    libgmodule-2.0          \
+    libgobject-2.0 			\
+    libgstpbutils-0.10
+
+LOCAL_MODULE:= libgstaudioresample
+
+LOCAL_CFLAGS := -DFLOATING_POINT -DOUTSIDE_SPEEX -DRANDOM_PREFIX=gst -DDISABLE_ORC -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
+LOCAL_PRELINK_MODULE := false
+
+#It's a gstreamer plugin so it should be installed in /lib/gstreamer-0.10
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)

android/audiotestsrc.mk

+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+audiotestsrc_LOCAL_SRC_FILES:= \
+	gst/audiotestsrc/gstaudiotestsrc.c
+
+LOCAL_SRC_FILES:= $(addprefix ../,$(audiotestsrc_LOCAL_SRC_FILES))
+
+LOCAL_SHARED_LIBRARIES := \
+    libgstcontroller-0.10   \
+    libgstaudio-0.10        \
+    libgstreamer-0.10       \
+    libgstbase-0.10         \
+    libglib-2.0             \
+    libgthread-2.0          \
+    libgmodule-2.0          \
+    libgobject-2.0
+
+LOCAL_MODULE:= libgstaudiotestsrc
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
+#
+# define LOCAL_PRELINK_MODULE to false to not use pre-link map
+#
+LOCAL_PRELINK_MODULE := false
+
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)

android/decodebin.mk

@@ -5,12 +5,10 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 
 decodebin_LOCAL_SRC_FILES_BASE:= \
-	gst/playback/gstdecodebin.c 
-decodebin_LOCAL_SRC_FILES_ANDROID:= \
+	gst/playback/gstdecodebin.c  \
     gst/playback/gstplay-marshal.c
 
-LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE)) \
-				  $(addprefix ../android/,$(decodebin_LOCAL_SRC_FILES_ANDROID))
+LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE))
 
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.10       \
@@ -23,23 +21,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstdecodebin
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/playback  		\
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)/..         			\
-    $(LOCAL_PATH)   	  				\
-	$(LOCAL_PATH)/gst/playback    		\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	-DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H	-DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -47,5 +30,6 @@ LOCAL_PRELINK_MODULE := false
 
 #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/decodebin2.mk

@@ -7,13 +7,10 @@ LOCAL_ARM_MODE := arm
 decodebin2_LOCAL_SRC_FILES_BASE:= \
 	gst/playback/gstdecodebin2.c \
     gst/playback/gsturidecodebin.c \
-	gst/playback/gstfactorylists.c \
-	gst/playback/gstplay-enum.c 
-decodebin2_LOCAL_SRC_FILES_ANDROID:= \
+	gst/playback/gstplay-enum.c  \
 	gst/playback/gstplay-marshal.c
 
-LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE)) \
-				  $(addprefix ../android/,$(decodebin2_LOCAL_SRC_FILES_ANDROID))
+LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE))
 
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.10       \
@@ -26,23 +23,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstdecodebin2
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/playback  		\
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)/..         			\
-    $(LOCAL_PATH)   	  				\
-	$(LOCAL_PATH)/gst/playback    		\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	
+LOCAL_CFLAGS := -DHAVE_CONFIG_H	 \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -50,5 +32,6 @@ LOCAL_PRELINK_MODULE := false
 
 #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/ffmpegcolorspace.mk

+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+ffmpegcolorspace_LOCAL_SRC_FILES:= \
+	gst/ffmpegcolorspace/gstffmpegcolorspace.c \
+	gst/ffmpegcolorspace/gstffmpegcodecmap.c \
+	gst/ffmpegcolorspace/dsputil.c \
+	gst/ffmpegcolorspace/imgconvert.c \
+	gst/ffmpegcolorspace/mem.c \
+	gst/ffmpegcolorspace/utils.c
+
+LOCAL_SRC_FILES:= $(addprefix ../,$(ffmpegcolorspace_LOCAL_SRC_FILES))
+
+LOCAL_SHARED_LIBRARIES := \
+    libgstvideo-0.10        \
+    libgstreamer-0.10       \
+    libgstbase-0.10         \
+    libglib-2.0             \
+    libgthread-2.0          \
+    libgmodule-2.0          \
+    libgobject-2.0 			\
+    libgstpbutils-0.10
+
+LOCAL_MODULE:= libgstffmpegcolorspace
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
+#
+# define LOCAL_PRELINK_MODULE to false to not use pre-link map
+#
+LOCAL_PRELINK_MODULE := false
+
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)

android/gdp.mk

@@ -22,23 +22,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstgdp
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/gdp    		\
-    $(LOCAL_PATH)/../gst-libs 			\
-    $(LOCAL_PATH)/..         			\
-    $(LOCAL_PATH)   	  				\
-	$(LOCAL_PATH)/gst/tcp    			\
-    $(TARGET_OUT_HEADERS)/gstreamer-0.10 \
-	$(TARGET_OUT_HEADERS)/glib-2.0 		\
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-	external/libxml2/include 
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H  -DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H  -DGSTREAMER_BUILT_FOR_ANDROID \
+	$(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -46,5 +31,6 @@ LOCAL_PRELINK_MODULE := false
 
 #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

android/gst-libs/gst/app/gstapp-marshal.c

-#include "gstapp-marshal.h"
-
-#include	<glib-object.h>
-
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v)      g_value_get_int (v)
-#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
-#define g_marshal_value_peek_long(v)     g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
-#define g_marshal_value_peek_float(v)    g_value_get_float (v)
-#define g_marshal_value_peek_double(v)   g_value_get_double (v)
-#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v)    g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v)   g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- *          Do not access GValues directly in your code. Instead, use the
- *          g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
-#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
-#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
-#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer