android: make it ready for androgenizer

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

diff --git a/Android.mk b/Android.mk
index d8a9773..437f369 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,12 +1,52 @@
 LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
 
-GSTREAMER_TOP := $(LOCAL_PATH)
+GST_PLUGINS_UGLY_TOP := $(LOCAL_PATH)
 
-include $(CLEAR_VARS)
-#dependancy library 
-#include $(GSTREAMER_TOP)/android/amrnb_library.mk
-#plugins
-include $(GSTREAMER_TOP)/android/mpegaudioparse.mk
-include $(GSTREAMER_TOP)/android/asf.mk
-#include $(GSTREAMER_TOP)/android/amrnb.mk
-#include $(GSTREAMER_TOP)/android/amrwbdec.mk
+GST_PLUGINS_UGLY_BUILT_SOURCES = \
+       ext/mad/Android.mk \
+       gst/synaesthesia/Android.mk \
+       gst/iec958/Android.mk \
+       gst/mpegaudioparse/Android.mk \
+       gst/mpegstream/Android.mk \
+       gst/realmedia/Android.mk \
+       gst/dvdsub/Android.mk \
+       gst/dvdlpcmdec/Android.mk \
+       gst/asfdemux/Android.mk \
+       ext/x264/Android.mk
+
+GST_PLUGINS_UGLY_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_UGLY_TOP))/%, $(GST_PLUGINS_UGLY_BUILT_SOURCES))
+
+.PHONY: gst-plugins-ugly-configure gst-plugins-ugly-configure-real
+
+gst-plugins-ugly-configure-real:
+       cd $(GST_PLUGINS_UGLY_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_UGLY_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
+       --prefix=/system --disable-orc --disable-valgrind --disable-gtk-doc && \
+       for file in $(GST_PLUGINS_UGLY_BUILT_SOURCES); do \
+               rm -f $$file && \
+               make -C $$(dirname $$file) $$(basename $$file) ; \
+       done
+
+gst-plugins-ugly-configure: gst-plugins-ugly-configure-real
+
+CONFIGURE_TARGETS += gst-plugins-ugly-configure
+
+-include $(GST_PLUGINS_UGLY_TOP)/ext/mad/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/ext/x264/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/synaesthesia/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/iec958/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/mpegaudioparse/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/mpegstream/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/realmedia/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/dvdsub/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/dvdlpcmdec/Android.mk
+-include $(GST_PLUGINS_UGLY_TOP)/gst/asfdemux/Android.mk

diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am
index efae89a..8923456 100644 (file)
--- a/ext/mad/Makefile.am
+++ b/ext/mad/Makefile.am
@@ -12,3 +12,18 @@ libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmad_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstmad.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstmad -:SHARED libgstmad \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstmad_la_SOURCES) \
+        -:CPPFLAGS $(CPPFLAGS) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmad_la_CFLAGS) \
+        -:LDFLAGS $(libgstmad_la_LDFLAGS) \
+                  $(libgstmad_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am
index 6c4d4cf..f559013 100644 (file)
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@@ -19,3 +19,17 @@ preset_DATA = GstX264Enc.prs
 
 EXTRA_DIST = $(preset_DATA)
 
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstx264 -:SHARED libgstx264 \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstx264_la_SOURCES) \
+        -:CPPFLAGS $(CPPFLAGS) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstx264_la_CFLAGS) -I'$$(GSTREAMER_AGGREGATE_TOP)/x264' \
+        -:LDFLAGS $(libgstx264_la_LDFLAGS) \
+                  $(libgstx264_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index 5fda983..c4e03b3 100644 (file)
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -11,3 +11,17 @@ libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstasf_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstasfdemux -:SHARED libgstasfdemux \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstasfdemux_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstasfdemux_la_CFLAGS) \
+        -:LDFLAGS $(libgstasfdemux_la_LDFLAGS) \
+                  $(libgstasfdemux_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am
index 7fe692e..1e4367b 100644 (file)
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@@ -8,3 +8,17 @@ libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdlpcmdec_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstdvdlpcmdec.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstdvdlpcmdec -:SHARED libgstdvdlpcmdec \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstdvdlpcmdec_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdvdlpcmdec_la_CFLAGS) \
+        -:LDFLAGS $(libgstdvdlpcmdec_la_LDFLAGS) \
+                  $(libgstdvdlpcmdec_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am
index d757c54..8042b75 100644 (file)
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@@ -7,3 +7,17 @@ libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdsub_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstdvdsub -:SHARED libgstdvdsub \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstdvdsub_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdvdsub_la_CFLAGS) \
+        -:LDFLAGS $(libgstdvdsub_la_LDFLAGS) \
+                  $(libgstdvdsub_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/iec958/Makefile.am b/gst/iec958/Makefile.am
index fdd207f..b3e0406 100644 (file)
--- a/gst/iec958/Makefile.am
+++ b/gst/iec958/Makefile.am
@@ -7,3 +7,17 @@ libgstiec958_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstiec958_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = ac3_padder.h ac3iec.h 
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstiec958 -:SHARED libgstiec958 \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstiec958_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstiec958_la_CFLAGS) \
+        -:LDFLAGS $(libgstiec958_la_LDFLAGS) \
+                  $(libgstiec958_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am
index 6d3c464..61a00bd 100644 (file)
--- a/gst/mpegaudioparse/Makefile.am
+++ b/gst/mpegaudioparse/Makefile.am
@@ -7,3 +7,17 @@ libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegaudioparse_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstmpegaudioparse.h gstxingmux.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstmpegaudioparse -:SHARED libgstmpegaudioparse \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstmpegaudioparse_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegaudioparse_la_CFLAGS) \
+        -:LDFLAGS $(libgstmpegaudioparse_la_LDFLAGS) \
+                  $(libgstmpegaudioparse_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/mpegstream/Makefile.am b/gst/mpegstream/Makefile.am
index f17a258..7f7166f 100644 (file)
--- a/gst/mpegstream/Makefile.am
+++ b/gst/mpegstream/Makefile.am
@@ -20,3 +20,17 @@ noinst_HEADERS = gstmpegparse.h \
                 gstrfc2250enc.h
 
 EXTRA_DIST = README notes
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstmpegstream -:SHARED libgstmpegstream \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstmpegstream_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegstream_la_CFLAGS) \
+        -:LDFLAGS $(libgstmpegstream_la_LDFLAGS) \
+                  $(libgstmpegstream_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index aaac3c9..c17d8f1 100644 (file)
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -24,3 +24,16 @@ noinst_PROGRAMS = asmrules
 asmrules_CFLAGS = $(GST_CFLAGS) -DTEST
 asmrules_LDADD = $(GST_LIBS) $(LIBM)
 
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstrealmedia -:SHARED libgstrealmedia \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstrealmedia_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrealmedia_la_CFLAGS) \
+        -:LDFLAGS $(libgstrealmedia_la_LDFLAGS) \
+                  $(libgstrealmedia_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@

diff --git a/gst/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am
index 912f2be..da4f986 100644 (file)
--- a/gst/synaesthesia/Makefile.am
+++ b/gst/synaesthesia/Makefile.am
@@ -10,3 +10,17 @@ libgstsynaesthesia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsynaesthesia_la_LIBTOOLFLAGS = --tag=disable-static
 
 EXTRA_DIST = README
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libgstsynaesthesia -:SHARED libgstsynaesthesia \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstsynaesthesia_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstsynaesthesia_la_CFLAGS) \
+        -:LDFLAGS $(libgstsynaesthesia_la_LDFLAGS) \
+                  $(libgstsynaesthesia_la_LIBADD) \
+                  -ldl \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+       > $@