diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-11-13 13:23:09 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-11-13 13:23:09 +0000 |
| commit | bb18ca7fa47c69edbed53d6cab7f4635aac8e297 (patch) | |
| tree | 9ccb2384798847acbbf6a8b32f76a22458c473af /Android.mk | |
| parent | ae5e44bfb36ec99382081379952e004d335f4a26 (diff) | |
| parent | c0d5857cd997ee8d3e6674bf92f7ad76c2c2de8e (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
tools/gst-inspect.c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 10b28a865d..8f20a4d09e 100644 --- a/Android.mk +++ b/Android.mk @@ -36,6 +36,7 @@ GST_BUILT_SOURCES := \ plugins/Android.mk \ plugins/elements/Android.mk \ plugins/indexers/Android.mk \ + tests/examples/controller/Android.mk \ tools/Android.mk GST_BUILT_SOURCES := $(patsubst %, $(abspath $(gstreamer_TOP))/%, $(GST_BUILT_SOURCES)) @@ -68,3 +69,4 @@ CONFIGURE_TARGETS += gst-configure -include $(gstreamer_TOP)/libs/Android.mk -include $(gstreamer_TOP)/plugins/Android.mk -include $(gstreamer_TOP)/tools/Android.mk +-include $(gstreamer_TOP)/tests/examples/controller/Android.mk |