Remove obsolete Android build cruft

This is not needed any longer.

55 files changed, 0 insertions, 2055 deletions

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 4b42d7aae..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-GST_PLUGINS_BASE_TOP := $(LOCAL_PATH)
-
-GST_PLUGINS_BASE_BUILT_SOURCES := 						\
-	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				\
-	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/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/videoconvert/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
-
-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))
-
-
-.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=/ \
-	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 && \
-	for file in $(GST_PLUGINS_BASE_BUILT_SOURCES); do \
-		rm -f $$file && \
-		make -C $$(dirname $$file) $$(basename $$file) ; \
-	done
-
-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/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/videoconvert/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
-ifneq ($(NDK_BUILD), true)
--include $(GST_PLUGINS_BASE_TOP)/ext/vorbis/Android.mk
-endif
--include $(GST_PLUGINS_BASE_TOP)/tools/Android.mk
diff --git a/android/NOTICE b/android/NOTICE
deleted file mode 100644
index c87cfe8c9..000000000
--- a/android/NOTICE
+++ /dev/null
@@ -1,481 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/android/alsa.mk b/android/alsa.mk
deleted file mode 100644
index abfec20e7..000000000
--- a/android/alsa.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-alsa_LOCAL_SRC_FILES:= \
-	ext/alsa/gstalsadeviceprobe.c \
-   	ext/alsa/gstalsamixer.c \
-   	ext/alsa/gstalsamixerelement.c \
-   	ext/alsa/gstalsamixertrack.c \
-   	ext/alsa/gstalsamixeroptions.c \
-   	ext/alsa/gstalsaplugin.c \
-   	ext/alsa/gstalsasink.c \
-   	ext/alsa/gstalsasrc.c \
-   	ext/alsa/gstalsa.c 
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(alsa_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-	libdl                   \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstinterfaces-1.0   \
-	libgstaudio-1.0
-
-LOCAL_MODULE:= libgstalsa
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libasound
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-
-
-$(TARGET_OUT)/lib/libgstalsa.so:
-
-ALL_PREBUILT += $(TARGET_OUT)/lib/libgstalsa.so
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/app.mk b/android/app.mk
deleted file mode 100644
index d4f8541fc..000000000
--- a/android/app.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_app_COPY_HEADERS_TO := gstreamer-1.0/gst/app
-gst_app_COPY_HEADERS := \
-	../gst-libs/gst/app/gstappbuffer.h \
-	../gst-libs/gst/app/gstappsink.h \
-	../gst-libs/gst/app/gstappsrc.h
-
-include $(CLEAR_VARS)
-
-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  \
-	gst-libs/gst/app/gstapp-marshal.c
-  	
-LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 
-
-LOCAL_MODULE:= libgstapp-1.0
-
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_app_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_app_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/app_plugin.mk b/android/app_plugin.mk
deleted file mode 100644
index a52444a57..000000000
--- a/android/app_plugin.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-app_plugin_LOCAL_SRC_FILES:= \
-	gst/app/gstapp.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(app_plugin_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstapp-1.0
-
-LOCAL_MODULE:= libgstapp
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/audio.mk b/android/audio.mk
deleted file mode 100644
index 66510653b..000000000
--- a/android/audio.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_audio_COPY_HEADERS_TO := gstreamer-1.0/gst/audio
-gst_audio_COPY_HEADERS_BASE := \
-	gst-libs/gst/audio/audio.h \
-	gst-libs/gst/audio/gstaudioclock.h \
-	gst-libs/gst/audio/gstaudiofilter.h \
-	gst-libs/gst/audio/gstaudiosink.h \
-	gst-libs/gst/audio/gstaudiosrc.h \
-	gst-libs/gst/audio/gstbaseaudiosink.h \
-	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-libs/gst/audio/audio-enumtypes.h 
-
-gst_audio_COPY_HEADERS := $(addprefix ../,$(gst_audio_COPY_HEADERS_BASE)) \
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-# TODO: mixerutils.c is removed, because it depends on gst-lib/gst/interface.
-# We need add it later
-audio_LOCAL_SRC_FILES_BASE:= \
-	gst-libs/gst/audio/audio.c \
-	gst-libs/gst/audio/gstaudioclock.c \
-	gst-libs/gst/audio/mixerutils.c \
-	gst-libs/gst/audio/multichannel.c \
-	gst-libs/gst/audio/gstaudiofilter.c \
-	gst-libs/gst/audio/gstaudiosink.c \
-	gst-libs/gst/audio/gstaudiosrc.c \
-	gst-libs/gst/audio/gstbaseaudiosink.c \
-	gst-libs/gst/audio/gstbaseaudiosrc.c \
-	gst-libs/gst/audio/gstringbuffer.c  \
-	gst-libs/gst/audio/audio-enumtypes.c
-        
-LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstinterfaces-1.0
-
-LOCAL_MODULE:= libgstaudio-1.0
-
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_audio_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_audio_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/audioconvert.mk b/android/audioconvert.mk
deleted file mode 100644
index 3afb78976..000000000
--- a/android/audioconvert.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-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 
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(audioconvert_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstaudio-1.0        \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-    libgstpbutils-1.0
-
-LOCAL_MODULE:= libgstaudioconvert
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/audioresample.mk b/android/audioresample.mk
deleted file mode 100644
index 842151139..000000000
--- a/android/audioresample.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-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)
diff --git a/android/audiotestsrc.mk b/android/audiotestsrc.mk
deleted file mode 100644
index 06a76c342..000000000
--- a/android/audiotestsrc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-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)
diff --git a/android/decodebin.mk b/android/decodebin.mk
deleted file mode 100644
index 3e3ab2bc1..000000000
--- a/android/decodebin.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-decodebin_LOCAL_SRC_FILES_BASE:= \
-	gst/playback/gstdecodebin.c  \
-    gst/playback/gstplay-marshal.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstpbutils-1.0
-
-LOCAL_MODULE:= libgstdecodebin
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/decodebin2.mk b/android/decodebin2.mk
deleted file mode 100644
index 821f08053..000000000
--- a/android/decodebin2.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-decodebin2_LOCAL_SRC_FILES_BASE:= \
-	gst/playback/gstdecodebin2.c \
-    gst/playback/gsturidecodebin.c \
-	gst/playback/gstplay-enum.c  \
-	gst/playback/gstplay-marshal.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstpbutils-1.0
-
-LOCAL_MODULE:= libgstdecodebin2
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	 \
-	$(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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/gdp.mk b/android/gdp.mk
deleted file mode 100644
index 47cfc30f4..000000000
--- a/android/gdp.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-gdp_LOCAL_SRC_FILES:= \
-	gst/gdp/gstgdp.c \
-	gst/gdp/gstgdppay.c \
-	gst/gdp/gstgdpdepay.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(gdp_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgstgdp
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/pbutils.mk b/android/pbutils.mk
deleted file mode 100644
index 6ace129c1..000000000
--- a/android/pbutils.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-GST_PBUTILS_DIR := gst-libs/gst/pbutils/
-
-gst_pbutils_COPY_HEADERS_TO := gstreamer-1.0/gst/pbutils
-gst_pbutils_COPY_HEADERS_BASE := \
-	gst-libs/gst/pbutils/descriptions.h \
-	gst-libs/gst/pbutils/install-plugins.h \
-	gst-libs/gst/pbutils/missing-plugins.h \
-	gst-libs/gst/pbutils/pbutils.h \
-	gst-libs/gst/pbutils/pbutils-enumtypes.h
-
-gst_pbutils_COPY_HEADERS := $(addprefix ../,$(gst_pbutils_COPY_HEADERS_BASE))
-	
-
-
-
-LOCAL_ARM_MODE := arm
-
-BUILT_SOURCES = \
-	pbutils-enumtypes.c \
-	pbutils-enumtypes.h \
-	pbutils-marshal.c   \
-	pbutils-marshal.h
-
-LOCAL_SRC_FILES := \
-	gstpluginsbaseversion.c \
-	pbutils.c         	\
-	codec-utils.c     	\
-	descriptions.c    	\
-	encoding-profile.c	\
-	encoding-target.c	\
-	install-plugins.c 	\
-	missing-plugins.c 	\
-	gstdiscoverer.c   	\
-	gstdiscoverer-types.c 	\
-	pbutils-enumtypes.c	\
-	pbutils-marshal.c
-
-LOCAL_SRC_FILES := $(addprefix ../$(GST_PBUTILS_DIR),$(LOCAL_SRC_FILES))
-
-$(BUILT_SOURCES):
-	make -C $(GST_PLUGINS_BASE_TOP)/$(GST_PBUTILS_DIR) $@
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstvideo-1.0        \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			
-
-LOCAL_MODULE:= libgstpbutils-1.0
-LOCAL_CFLAGS := -DGSTREAMER_BUILT_FOR_ANDROID \
-	$(GST_PLUGINS_BASE_CFLAGS)
-#
-# define LOCAL_PRELINK_MODULE to false to not use pre-link map
-#
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_COPY_HEADERS_TO := $(gst_pbutils_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_pbutils_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/playbin.mk b/android/playbin.mk
deleted file mode 100644
index dfb2cf581..000000000
--- a/android/playbin.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-playbin_LOCAL_SRC_FILES_BASE:= \
-	gst/playback/gstplayback.c \
-   	gst/playback/gstplaybin.c \
-   	gst/playback/gstplaybin2.c \
-   	gst/playback/gstplaysink.c \
-   	gst/playback/gstplaybasebin.c \
-	gst/playback/gstplay-enum.c \
-	gst/playback/gststreaminfo.c \
-	gst/playback/gststreamselector.c \
-	gst/playback/gstsubtitleoverlay.c \
-	gst/playback/gststreamsynchronizer.c \
-	gst/playback/gstplay-marshal.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstpbutils-1.0 		\
-	libgstinterfaces-1.0 	\
-	libgstvideo-1.0
-
-LOCAL_MODULE:= libgstplaybin
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/queue2.mk b/android/queue2.mk
deleted file mode 100644
index 146f35008..000000000
--- a/android/queue2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-queue2_LOCAL_SRC_FILES_BASE:= \
-	gst/playback/gstqueue2.c  \
-    gst/playback/gstplay-marshal.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(queue2_LOCAL_SRC_FILES_BASE))
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgstpbutils-1.0
-
-LOCAL_MODULE:= libgstqueue2
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H	\
-	$(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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/riff.mk b/android/riff.mk
deleted file mode 100644
index a1113a654..000000000
--- a/android/riff.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_riffs_COPY_HEADERS_TO := gstreamer-1.0/gst/riff
-gst_riffs_COPY_HEADERS := \
-	../gst-libs/gst/riff/riff-ids.h \
-	../gst-libs/gst/riff/riff-media.h \
-	../gst-libs/gst/riff/riff-read.h
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-riff_LOCAL_SRC_FILES:= \
-	gst-libs/gst/riff/riff.c \
-	gst-libs/gst/riff/riff-media.c \
-	gst-libs/gst/riff/riff-read.c 
-    
-LOCAL_SRC_FILES:= $(addprefix ../,$(riff_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 			\
-	libgsttag-1.0          \
-    libgstaudio-1.0     
-
-
-LOCAL_MODULE:= libgstriff-1.0
-
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_riffs_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_riffs_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/rtp.mk b/android/rtp.mk
deleted file mode 100644
index 02e3dada8..000000000
--- a/android/rtp.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_rtp_COPY_HEADERS_TO := gstreamer-1.0/gst/rtp
-gst_rtp_COPY_HEADERS := \
-	../gst-libs/gst/rtp/gstbasertpaudiopayload.h \
-	../gst-libs/gst/rtp/gstbasertpdepayload.h \
-	../gst-libs/gst/rtp/gstbasertppayload.h \
-	../gst-libs/gst/rtp/gstrtcpbuffer.h \
-	../gst-libs/gst/rtp/gstrtpbuffer.h \
-	../gst-libs/gst/rtp/gstrtppayloads.h
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-rtp_LOCAL_SRC_FILES:= \
-	gst-libs/gst/rtp/gstrtpbuffer.c \
-	gst-libs/gst/rtp/gstrtcpbuffer.c \
-	gst-libs/gst/rtp/gstrtppayloads.c \
-	gst-libs/gst/rtp/gstbasertpaudiopayload.c \
-	gst-libs/gst/rtp/gstbasertppayload.c \
-	gst-libs/gst/rtp/gstbasertpdepayload.c 
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(rtp_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-	libdl                   \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0 		
-
-LOCAL_MODULE:= libgstrtp-1.0
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_rtp_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_rtp_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/rtsp.mk b/android/rtsp.mk
deleted file mode 100644
index a6e255e5d..000000000
--- a/android/rtsp.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_rtsp_COPY_HEADERS_TO := gstreamer-1.0/gst/rtsp
-gst_rtsp_COPY_HEADERS_BASE := \
-	gst-libs/gst/rtsp/gstrtspbase64.h \
-	gst-libs/gst/rtsp/gstrtspdefs.h \
-	gst-libs/gst/rtsp/gstrtspconnection.h \
-	gst-libs/gst/rtsp/gstrtspextension.h \
-	gst-libs/gst/rtsp/gstrtspmessage.h \
-	gst-libs/gst/rtsp/gstrtsprange.h \
-	gst-libs/gst/rtsp/gstrtsptransport.h \
-	gst-libs/gst/rtsp/gstrtspurl.h \
-	gst-libs/gst/rtsp/gstrtsp-enumtypes.h
-
-gst_rtsp_COPY_HEADERS := $(addprefix ../,$(gst_rtsp_COPY_HEADERS_BASE))
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-rtsp_LOCAL_SRC_FILES_BASE:= \
-	gst-libs/gst/rtsp/gstrtspbase64.c \
-	gst-libs/gst/rtsp/gstrtspdefs.c \
-	gst-libs/gst/rtsp/gstrtspconnection.c \
-	gst-libs/gst/rtsp/gstrtspextension.c \
-	gst-libs/gst/rtsp/gstrtspmessage.c \
-	gst-libs/gst/rtsp/gstrtsprange.c \
-	gst-libs/gst/rtsp/gstrtsptransport.c \
-	gst-libs/gst/rtsp/gstrtspurl.c  \
-	gst-libs/gst/rtsp/gstrtsp-enumtypes.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgstrtsp-1.0
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H -DINET_ADDRSTRLEN=16 -DGSTREAMER_BUILT_FOR_ANDROID \
-	$(GST_PLUGINS_BASE_CFLAGS)
-#
-# define LOCAL_PRELINK_MODULE to false to not use pre-link map
-#
-LOCAL_PRELINK_MODULE := false
-
-
-LOCAL_COPY_HEADERS_TO := $(gst_rtsp_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_rtsp_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/sdp.mk b/android/sdp.mk
deleted file mode 100644
index aa7b7f4c7..000000000
--- a/android/sdp.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_sdp_COPY_HEADERS_TO := gstreamer-1.0/gst/sdp
-gst_sdp_COPY_HEADERS := \
-	../gst-libs/gst/sdp/gstsdp.h \
-	../gst-libs/gst/sdp/gstsdpmessage.h
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-sdp_LOCAL_SRC_FILES:= \
-	gst-libs/gst/sdp/gstsdpmessage.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(sdp_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgstsdp-1.0
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_sdp_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_sdp_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/tag.mk b/android/tag.mk
deleted file mode 100644
index 982e9327a..000000000
--- a/android/tag.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_tag_COPY_HEADERS_TO := gstreamer-1.0/gst/tag
-gst_tag_COPY_HEADERS := \
-	../gst-libs/gst/tag/gsttagdemux.h \
-	../gst-libs/gst/tag/tag.h
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-tag_LOCAL_SRC_FILES:= \
-    gst-libs/gst/tag/gstvorbistag.c \
-   	gst-libs/gst/tag/gstid3tag.c \
-   	gst-libs/gst/tag/gstxmptag.c \
-   	gst-libs/gst/tag/gsttageditingprivate.c \
-	gst-libs/gst/tag/tags.c \
-	gst-libs/gst/tag/lang.c \
-	gst-libs/gst/tag/gsttagdemux.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(tag_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgsttag-1.0
-
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_tag_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_tag_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/tcp.mk b/android/tcp.mk
deleted file mode 100644
index a741b9cdc..000000000
--- a/android/tcp.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-tcp_LOCAL_SRC_FILES_BASE:= \
-	gst/tcp/gsttcpplugin.c  	\
-	gst/tcp/gsttcp.c 			\
-	gst/tcp/gstmultifdsink.c 	\
-	gst/tcp/gsttcpclientsrc.c 	\
-	gst/tcp/gsttcpclientsink.c 	\
-	gst/tcp/gsttcpserversrc.c 	\
-	gst/tcp/gsttcpserversink.c 	\
-	gst/tcp/gsttcp-enumtypes.c 	\
-	gst/tcp/gsttcp-marshal.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgsttcp
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/typefindfunctions.mk b/android/typefindfunctions.mk
deleted file mode 100644
index d0ca0f404..000000000
--- a/android/typefindfunctions.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-typefindfunctions_LOCAL_SRC_FILES:= \
-	gst/typefind/gsttypefindfunctions.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(typefindfunctions_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libgstpbutils-1.0	    \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgsttypefindfunctions
-
-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-1.0
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/video.mk b/android/video.mk
deleted file mode 100644
index 5ae9df57b..000000000
--- a/android/video.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#----------------------------------------
-# include 
-gst_video_COPY_HEADERS_TO := gstreamer-1.0/gst/video
-gst_video_COPY_HEADERS_BASE := \
-	gst-libs/gst/video/gstvideofilter.h \
-	gst-libs/gst/video/gstvideosink.h \
-	gst-libs/gst/video/video.h \
-	gst-libs/gst/video/video-enumtypes.h
-	
-gst_video_COPY_HEADERS := $(addprefix ../,$(gst_video_COPY_HEADERS_BASE)) 
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-video_LOCAL_SRC_FILES_BASE:= \
- 	gst-libs/gst/video/video.c \
-   	gst-libs/gst/video/gstvideosink.c \
-   	gst-libs/gst/video/gstvideofilter.c \
-	gst-libs/gst/video/convertframe.c \
-   	gst-libs/gst/video/video-enumtypes.c
-   
-LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstreamer-1.0       \
-    libgstbase-1.0         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgstvideo-1.0
-
-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
-
-LOCAL_COPY_HEADERS_TO := $(gst_video_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(gst_video_COPY_HEADERS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/videoconvert.mk b/android/videoconvert.mk
deleted file mode 100644
index 99d639116..000000000
--- a/android/videoconvert.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-videoconvert_LOCAL_SRC_FILES:= \
-	gst/videoconvert/gstvideoconvert.c \
-	gst/videoconvert/gstvideoconvertorc-dist.c \
-	gst/videoconvert/videoconvert.c
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(videoconvert_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:= libgstvideoconvert
-
-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)
diff --git a/android/videoscale.mk b/android/videoscale.mk
deleted file mode 100644
index 83afa383b..000000000
--- a/android/videoscale.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-videoscale_LOCAL_SRC_FILES:= \
-	gst/videoscale/gstvideoscale.c \
-	gst/videoscale/gstvideoscaleorc-dist.c \
-	gst/videoscale/vs_4tap.c \
-	gst/videoscale/vs_fill_borders.c \
-	gst/videoscale/vs_image.c   \
-    gst/videoscale/vs_scanline.c 
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(videoscale_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:= libgstvideoscale
-
-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)
diff --git a/android/videotestsrc.mk b/android/videotestsrc.mk
deleted file mode 100644
index 3385aa102..000000000
--- a/android/videotestsrc.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-videotestsrc_LOCAL_SRC_FILES:= \
-	gst/videotestsrc/gstvideotestsrc.c \
-	gst/videotestsrc/videotestsrc.c \
-	gst/videotestsrc/gstvideotestsrcorc-dist.c \
-
-
-LOCAL_SRC_FILES:= $(addprefix ../,$(videotestsrc_LOCAL_SRC_FILES))
-
-LOCAL_SHARED_LIBRARIES := \
-    libgstcontroller-0.10   \
-    libgstvideo-0.10        \
-    libgstreamer-0.10       \
-    libgstbase-0.10         \
-    libglib-2.0             \
-    libgthread-2.0          \
-    libgmodule-2.0          \
-    libgobject-2.0
-
-LOCAL_MODULE:= libgstvideotestsrc
-
-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)
diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index 9fd326c07..1128141c2 100644
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -35,18 +35,3 @@ libgstogg_la_LIBADD = \
 	$(OGG_LIBS)
 libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstogg_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstogg -:SHARED libgstogg \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstogg_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstogg_la_CFLAGS) \
-	 -:LDFLAGS $(libgstogg_la_LDFLAGS) \
-	           $(libgstogg_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index 41062bb55..cc3d28e52 100644
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -45,18 +45,3 @@ noinst_HEADERS = gstvorbisenc.h \
 		 gstvorbisparse.h \
 		 gstvorbistag.h \
 		 gstvorbiscommon.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstivorbisdec -:SHARED libgstivorbisdec \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstivorbisdec_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstivorbisdec_la_CFLAGS) \
-	 -:LDFLAGS $(libgstivorbisdec_la_LDFLAGS) \
-	           $(libgstivorbisdec_la_LIBADD) \
-		   -lvorbisidec \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
index c49207723..9361bf9d3 100644
--- a/gst-libs/gst/allocators/Makefile.am
+++ b/gst-libs/gst/allocators/Makefile.am
@@ -63,17 +63,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am
-	androgenizer -:PROJECT libgstallocators -:SHARED libgstallocators-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstallocators_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(libgstallocators_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstallocators_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstallocators_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/allocators \
-	 -:HEADERS $(libgstallocatorsinclude_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 1091111ae..9e40db33c 100644
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -81,18 +81,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstapp -:SHARED libgstapp-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstapp_@GST_API_VERSION@_la_SOURCES) \
-	           $(nodist_libgstapp_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstapp_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstapp_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstapp_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/app \
-	 -:HEADERS $(libgstapp_@GST_API_VERSION@include_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index d8a79388f..cd39fd490 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -136,19 +136,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstaudio -:SHARED libgstaudio-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstaudio_@GST_API_VERSION@_la_SOURCES) \
-	           $(nodist_libgstaudio_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudio_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstaudio_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstaudio_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \
-	 -:HEADERS $(libgstaudio_@GST_API_VERSION@include_HEADERS) \
-	           $(nodist_libgstaudio_@GST_API_VERSION@include_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index 41c832d1c..09b3d6822 100644
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -90,17 +90,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am
-	androgenizer -:PROJECT libgstfft -:SHARED libgstfft-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstfft_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(libgstfft_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstfft_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstfft_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/fft \
-	 -:HEADERS $(libgstfftinclude_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 471f5c6f7..34553c1bd 100644
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -128,19 +128,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstpbutils -:SHARED libgstpbutils-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstpbutils_@GST_API_VERSION@_la_SOURCES) \
-	           $(nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstpbutils_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstpbutils_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstpbutils_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/pbutils \
-	 -:HEADERS $(libgstpbutils_@GST_API_VERSION@include_HEADERS) \
-	           $(nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 21b617b28..0c428c507 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -74,17 +74,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am
-	androgenizer -:PROJECT libgstriff -:SHARED libgstriff-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstriff_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstriff_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstriff_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstriff_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \
-	 -:HEADERS $(libgstriff_@GST_API_VERSION@include_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
index 30183338d..bec9524aa 100644
--- a/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@ -73,17 +73,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstrtp -:SHARED libgstrtp-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstrtp_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtp_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstrtp_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstrtp_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/rtp \
-	 -:HEADERS $(libgstrtp_@GST_API_VERSION@include_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index a1f994f4d..3a874803a 100644
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -101,19 +101,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstrtsp -:SHARED libgstrtsp-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstrtsp_@GST_API_VERSION@_la_SOURCES) \
-	           $(nodist_libgstrtsp_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtsp_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstrtsp_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstrtsp_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/rtsp \
-	 -:HEADERS $(libgstrtspinclude_HEADERS) \
-	           $(nodist_libgstrtspinclude_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
index 0d8ff8138..a90f30bb6 100644
--- a/gst-libs/gst/sdp/Makefile.am
+++ b/gst-libs/gst/sdp/Makefile.am
@@ -57,17 +57,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstsdp -:SHARED libgstsdp-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstsdp_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstsdp_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstsdp_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstsdp_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/sdp \
-	 -:HEADERS $(libgstsdpinclude_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index a5d722d2f..2c404a972 100644
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -105,17 +105,3 @@ update-licenses: mklicensestables
 licensetransdir = $(pkgdatadir)/@GST_API_VERSION@
 licensetrans_DATA = $(srcdir)/license-translations.dict
 #endif
-
-Android.mk: Makefile.am
-	androgenizer -:PROJECT libgsttag -:SHARED libgsttag-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgsttag_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttag_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgsttag_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgsttag_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \
-	 -:HEADERS $(libgsttaginclude_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 169d7bc53..7ac5f4455 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -140,19 +140,3 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer -:PROJECT libgstvideo -:SHARED libgstvideo-@GST_API_VERSION@ \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstvideo_@GST_API_VERSION@_la_SOURCES) \
-	           $(nodist_libgstvideo_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideo_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstvideo_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstvideo_@GST_API_VERSION@_la_LIBADD) \
-	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \
-	 -:HEADERS $(libgstvideo_@GST_API_VERSION@include_HEADERS) \
-	           $(nodist_libgstvideo_@GST_API_VERSION@include_HEADERS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@
diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am
index c899cfc38..3ba6523f0 100644
--- a/gst/adder/Makefile.am
+++ b/gst/adder/Makefile.am
@@ -14,18 +14,3 @@ libgstadder_la_LIBADD =  \
 libgstadder_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstadder.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstadder -:SHARED libgstadder \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstadder_la_SOURCES) \
-	    $(nodist_libgstadder_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstadder_la_CFLAGS) \
-	 -:LDFLAGS $(libgstadder_la_LDFLAGS) \
-	           $(libgstadder_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/app/Makefile.am b/gst/app/Makefile.am
index eb74cbcd2..bdd761a9c 100644
--- a/gst/app/Makefile.am
+++ b/gst/app/Makefile.am
@@ -5,17 +5,3 @@ libgstapp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS
 libgstapp_la_LIBADD = $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la $(GST_BASE_LIBS)
 libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstapp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstapp -:SHARED libgstapp \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstapp_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstapp_la_CFLAGS) \
-	 -:LDFLAGS $(libgstapp_la_LDFLAGS) \
-	           $(libgstapp_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am
index 66846fc51..1e2672b61 100644
--- a/gst/audioconvert/Makefile.am
+++ b/gst/audioconvert/Makefile.am
@@ -25,18 +25,3 @@ noinst_HEADERS = \
 	gstaudioquantize.h \
 	gstfastrandom.h \
 	plugin.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstaudioconvert -:SHARED libgstaudioconvert \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstaudioconvert_la_SOURCES) \
-	 	   $(nodist_libgstaudioconvert_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudioconvert_la_CFLAGS) \
-	 -:LDFLAGS $(libgstaudioconvert_la_LDFLAGS) \
-	           $(libgstaudioconvert_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am
index 9c21d0731..2b0697c81 100644
--- a/gst/audiorate/Makefile.am
+++ b/gst/audiorate/Makefile.am
@@ -9,17 +9,3 @@ libgstaudiorate_la_LIBADD = $(GST_LIBS) \
         $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la
 
 libgstaudiorate_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstaudiorate -:SHARED libgstaudiorate \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstaudiorate_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudiorate_la_CFLAGS) \
-	 -:LDFLAGS $(libgstaudiorate_la_LDFLAGS) \
-	           $(libgstaudiorate_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am
index 607115d55..728700d2f 100644
--- a/gst/audioresample/Makefile.am
+++ b/gst/audioresample/Makefile.am
@@ -42,17 +42,3 @@ noinst_HEADERS = \
 	resample_neon.h \
 	speex_resampler.h \
 	speex_resampler_wrapper.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstaudioresample -:SHARED libgstaudioresample \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstaudioresample_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudioresample_la_CFLAGS) \
-	 -:LDFLAGS $(libgstaudioresample_la_LDFLAGS) \
-	           $(libgstaudioresample_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/audiotestsrc/Makefile.am b/gst/audiotestsrc/Makefile.am
index 3680d20bb..027d2b766 100644
--- a/gst/audiotestsrc/Makefile.am
+++ b/gst/audiotestsrc/Makefile.am
@@ -9,17 +9,3 @@ libgstaudiotestsrc_la_LIBADD = \
 libgstaudiotestsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaudiotestsrc.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstaudiotestsrc -:SHARED libgstaudiotestsrc \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstaudiotestsrc_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudiotestsrc_la_CFLAGS) \
-	 -:LDFLAGS $(libgstaudiotestsrc_la_LDFLAGS) \
-	           $(libgstaudiotestsrc_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am
index 8ce197827..f9e73792e 100644
--- a/gst/encoding/Makefile.am
+++ b/gst/encoding/Makefile.am
@@ -21,18 +21,3 @@ noinst_HEADERS = 		\
 	gststreamcombinerpad.h
 
 include $(top_srcdir)/common/gst-glib-gen.mak
-
-Android.mk: Makefile.am
-	androgenizer \
-	-:PROJECT libgstencodebin -:SHARED libgstencodebin \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstencodebin_la_SOURCES) \
-	 	   $(nodist_libgstencodebin_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstencodebin_la_CFLAGS) \
-	 -:LDFLAGS $(libgstencodebin_la_LDFLAGS) \
-	           $(libgstencodebin_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index 24e6b164f..cc2c5ce2b 100644
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -39,18 +39,3 @@ noinst_HEADERS = \
 BUILT_SOURCES = $(built_headers) $(built_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstplayback -:SHARED libgstplayback \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstplayback_la_SOURCES) \
-	           $(nodist_libgstplayback_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstplayback_la_CFLAGS) $(csp_cflags) \
-	 -:LDFLAGS $(libgstplayback_la_LDFLAGS) \
-	           $(libgstplayback_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index bc91a427d..1ff06a38c 100644
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -30,18 +30,3 @@ noinst_HEADERS = \
   gsttcpserversrc.h gsttcpserversink.h gstmultihandlesink.h
 
 CLEANFILES = $(BUILT_SOURCES)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgsttcp -:SHARED libgsttcp \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgsttcp_la_SOURCES) \
-	 	   $(nodist_libgsttcp_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttcp_la_CFLAGS) \
-	 -:LDFLAGS $(libgsttcp_la_LDFLAGS) \
-	           $(libgsttcp_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am
index 414b55d62..3213c404d 100644
--- a/gst/typefind/Makefile.am
+++ b/gst/typefind/Makefile.am
@@ -10,17 +10,3 @@ libgsttypefindfunctions_la_LIBADD = \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 
 libgsttypefindfunctions_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgsttypefindfunctions -:SHARED libgsttypefindfunctions \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgsttypefindfunctions_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttypefindfunctions_la_CFLAGS) \
-	 -:LDFLAGS $(libgsttypefindfunctions_la_LDFLAGS) \
-	           $(libgsttypefindfunctions_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/videoconvert/Makefile.am b/gst/videoconvert/Makefile.am
index aa449dcd3..67b562543 100644
--- a/gst/videoconvert/Makefile.am
+++ b/gst/videoconvert/Makefile.am
@@ -14,18 +14,3 @@ libgstvideoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideoconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideoconvert.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstvideoconvert -:SHARED libgstvideoconvert \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstvideoconvert_la_SOURCES) \
-	           $(nodist_libgstvideoconvert_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideoconvert_la_CFLAGS) \
-	 -:LDFLAGS $(libgstvideoconvert_la_LDFLAGS) \
-	           $(libgstvideoconvert_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/videorate/Makefile.am b/gst/videorate/Makefile.am
index bc483d7f8..e107924f8 100644
--- a/gst/videorate/Makefile.am
+++ b/gst/videorate/Makefile.am
@@ -10,17 +10,3 @@ libgstvideorate_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstvideorate_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstvideorate -:SHARED libgstvideorate \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstvideorate_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideorate_la_CFLAGS) \
-	 -:LDFLAGS $(libgstvideorate_la_LDFLAGS) \
-	           $(libgstvideorate_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index 053cddf4b..946261144 100644
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -11,17 +11,3 @@ libgstvideoscale_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstvideoscale.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstvideoscale -:SHARED libgstvideoscale \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstvideoscale_la_SOURCES)
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideoscale_la_CFLAGS) \
-	 -:LDFLAGS $(libgstvideoscale_la_LDFLAGS) \
-	           $(libgstvideoscale_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am
index 52230f2c3..6c37d1cf7 100644
--- a/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@ -22,18 +22,3 @@ EXTRA_PROGRAMS = generate_sine_table
 generate_sine_table_SOURCES = generate_sine_table.c
 generate_sine_table_CFLAGS = $(GST_CFLAGS)
 generate_sine_table_LDADD = $(LIBM) $(GLIB_LIBS)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstvideotestsrc -:SHARED libgstvideotestsrc \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstvideotestsrc_la_SOURCES) \
-	 	   $(nodist_libgstvideotestsrc_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideotestsrc_la_CFLAGS) \
-	 -:LDFLAGS $(libgstvideotestsrc_la_LDFLAGS) \
-	           $(libgstvideotestsrc_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index bb83001ad..e1dd73839 100644
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -15,18 +15,3 @@ libgstvolume_la_LIBADD = \
 libgstvolume_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvolume.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-	androgenizer \
-	-:PROJECT libgstvolume -:SHARED libgstvolume \
-	 -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstvolume_la_SOURCES) \
-	  $(nodist_libgstvolume_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvolume_la_CFLAGS) \
-	 -:LDFLAGS $(libgstvolume_la_LDFLAGS) \
-	           $(libgstvolume_la_LIBADD) \
-	           -ldl \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-	> $@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 74d11ca8a..d6da6e2ef 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -28,14 +28,3 @@ LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 
 AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-
-Android.mk: Makefile.am
-	androgenizer -:PROJECT gst-discoverer-@GST_API_VERSION@ \
-	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:EXECUTABLE gst-discoverer-@GST_API_VERSION@ -:TAGS eng debug \
-	 -:SOURCES $(gst_discoverer_@GST_API_VERSION@_SOURCES) \
-	 -:CFLAGS $(DEFS) $(AM_CFLAGS) \
-	 -:LDFLAGS -lgstpbutils-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \
-	 	   $(GST_BASE_LIBS) $(GST_LIBS) \
-	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	> $@