summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-04-13 02:40:10 (GMT)
committerReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-04-13 02:40:10 (GMT)
commitfb0dc072a17098008ca28501afa5e7889672cc7d (patch)
tree829d2e26a19f094d6d380b7a28ae89221a1746f9
parentee00a48584013638b882bd7ac60cbe1bcb30ea60 (diff)
downloadgstreamer-0.10_ndk_bundle-fb0dc072a17098008ca28501afa5e7889672cc7d.tar.gz
gstreamer-0.10_ndk_bundle-fb0dc072a17098008ca28501afa5e7889672cc7d.tar.xz
Replace -openmax with -omx
-rw-r--r--jni/Android.mk2
-rwxr-xr-xsetup.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 08d7f29..8673c2a 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -140,7 +140,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-openmax/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
diff --git a/setup.sh b/setup.sh
index b7479b5..aa52962 100755
--- a/setup.sh
+++ b/setup.sh
@@ -6,5 +6,4 @@ target=`android list targets | grep "android-11" | cut -d' ' -f2`
android update project -n GStreamer -p . -t $target
for i in *; do if [ -d $i ]; then echo $i; cp config.sub $i; fi; done
rm -f res/config.sub
-cp config.sub gst-openmax/build-aux/
ANDROGENIZER_NDK=1 NDK_BUILD=1 ndk-build gstreamer-aggregate-configure && ndk-build && ant debug