summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-04-13 21:05:38 (GMT)
committerReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-04-13 21:35:11 (GMT)
commitb536f871f0282091b6c4f487b6df7e1d30146ed0 (patch)
tree47be3f192554304f9ce856b5754fe8e223bd06fd
parent6f5f4d38beb4c7a2a330e2a7be471bb68fdac67f (diff)
downloadgstreamer_ndk_bundle-b536f871f0282091b6c4f487b6df7e1d30146ed0.tar.gz
gstreamer_ndk_bundle-b536f871f0282091b6c4f487b6df7e1d30146ed0.tar.xz
Reenable building of now ported -omxHEADmaster
Bump gst-omx to get the 0.1 port and late buildsystem fixes Reenable -omx from the main Android.mk
m---------gst-omx0
-rw-r--r--jni/Android.mk8
2 files changed, 4 insertions, 4 deletions
diff --git a/gst-omx b/gst-omx
-Subproject 766dc7c54122f97f2a598d4690d9bff38a52137
+Subproject e6e3f05948d7e704f6038bf432ae895e9640034
diff --git a/jni/Android.mk b/jni/Android.mk
index 9093be8..942279f 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -44,9 +44,9 @@ ifeq ($(GST_PLUGINS_BAD_TOP),)
GST_PLUGINS_BAD_TOP := $(GSTREAMER_AGGREGATE_TOP)/gst-plugins-bad
endif
-#ifeq ($(GST_OMX_TOP),)
-#GST_OMX_TOP := $(GSTREAMER_AGGREGATE_TOP)/gst-omx
-#endif
+ifeq ($(GST_OMX_TOP),)
+GST_OMX_TOP := $(GSTREAMER_AGGREGATE_TOP)/gst-omx
+endif
ifeq ($(GNONLIN_TOP),)
GNONLIN_TOP := $(GSTREAMER_AGGREGATE_TOP)/gnonlin
@@ -149,7 +149,7 @@ ifeq ($(NDK_BUILD),false)
include $(GSTREAMER_AGGREGATE_TOP)/gnonlin/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/gst-editing-services/Android.mk
endif
-#include $(GSTREAMER_AGGREGATE_TOP)/gst-omx/Android.mk
+include $(GSTREAMER_AGGREGATE_TOP)/gst-omx/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/gst-plugins-bad/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/gst-android/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/gst-plugins-ugly/Android.mk