diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-27 15:44:58 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-27 15:44:58 +0200 |
| commit | 016d036137417662b97a59dee6402c62252e17af (patch) | |
| tree | e20c51425da6e67f74769f6dd85964b8f0c09271 /Android.mk | |
| parent | b21bb37657f773bf255c923620c55626d5abab4e (diff) | |
| parent | 1a7acdc99e9355cdae4c50356346ffb0c06e7fc8 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
gst-libs/gst/audio/gstbaseaudiosink.c
gst/audioconvert/channelmixtest.c
gst/playback/gstplaybasebin.c
gst/playback/gstsubtitleoverlay.c
tests/examples/Makefile.am
tests/examples/audio/Makefile.am
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 4bfbe75a4..f9f4cef55 100644 --- a/Android.mk +++ b/Android.mk @@ -61,9 +61,12 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ gst/audiorate/Android.mk \ gst/volume/Android.mk \ tools/Android.mk \ - ext/vorbis/Android.mk \ ext/ogg/Android.mk +ifneq ($(NDK_BUILD), true) +GST_PLUGINS_BASE_BUILT_SOURCES += ext/vorbis/Android.mk +endif + GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES)) @@ -119,5 +122,7 @@ CONFIGURE_TARGETS += gst-plugins-base-configure -include $(GST_PLUGINS_BASE_TOP)/gst/audiorate/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/volume/Android.mk -include $(GST_PLUGINS_BASE_TOP)/ext/ogg/Android.mk +ifneq ($(NDK_BUILD), true) -include $(GST_PLUGINS_BASE_TOP)/ext/vorbis/Android.mk +endif -include $(GST_PLUGINS_BASE_TOP)/tools/Android.mk |