summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@collabora.com>2013-11-22 17:23:31 -0300
committerThibault Saunier <thibault.saunier@collabora.com>2013-11-22 17:50:27 -0300
commit4b94efa246ba1d165f416583f870889a2a32952a (patch)
tree683aa19a4f9285b77531594a1cfdafca37a837c9
parent7b1df27c869e15f068ad561b482a3c670fb19d7e (diff)
Remove the android/ toplevel directory
To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files. Androgenizer can be found here: * http://cgit.collabora.com/git/android/androgenizer.git/
-rw-r--r--android/ges-launch.mk28
-rw-r--r--android/ges.mk71
2 files changed, 0 insertions, 99 deletions
diff --git a/android/ges-launch.mk b/android/ges-launch.mk
deleted file mode 100644
index 068b0385..00000000
--- a/android/ges-launch.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= ges-launch-0.10
-#LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES := ges-launch.c
-LOCAL_SRC_FILES := $(addprefix ../tools/,$(LOCAL_SRC_FILES))
-
-LOCAL_CFLAGS := $(GST_CFLAGS) \
- -I$(GES_TOP) \
- $(shell $(PKG_CONFIG) gstreamer-pbutils --cflags)
-
-LOCAL_SHARED_LIBRARIES := \
- libges-0.10 \
- libgstpbutils-0.10 \
- libgstcontroller-0.10 \
- libgstvideo-0.10 \
- libgstreamer-0.10 \
- libglib-2.0 \
- libgthread-2.0 \
- libgmodule-2.0 \
- libgobject-2.0
-
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
diff --git a/android/ges.mk b/android/ges.mk
deleted file mode 100644
index 043de8bb..00000000
--- a/android/ges.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= libges-0.10
-#LOCAL_ARM_MODE := arm
-
-built_source_make = gesmarshal.c
-
-LOCAL_SRC_FILES := \
- $(built_source_make) \
- ges.c \
- ges-enums.c \
- ges-custom-source-clip.c \
- ges-simple-layer.c \
- ges-timeline.c \
- ges-layer.c \
- ges-clip.c \
- ges-pipeline.c \
- ges-source-clip.c \
- ges-uri-clip.c \
- ges-operation-clip.c \
- ges-base-transition-clip.c \
- ges-transition-clip.c \
- ges-test-clip.c \
- ges-title-clip.c \
- ges-overlay-clip.c \
- ges-text-overlay-clip.c \
- ges-track.c \
- ges-track-element.c \
- ges-source.c \
- ges-operation.c \
- ges-uri-source.c \
- ges-image-source.c \
- ges-transition.c \
- ges-audio-transition.c \
- ges-video-transition.c \
- ges-video-test-source.c \
- ges-audio-test-source.c \
- ges-title-source.c \
- ges-text-overlay.c \
- ges-screenshot.c \
- ges-formatter.c \
- ges-keyfile-formatter.c \
- ges-utils.c
-
-$(GES_TOP)/ges/gesmarshal.h:
- make -C $(GES_TOP)/ges gesmarshal.h
-
-$(GES_TOP)/ges/gesmarshal.c: $(GES_TOP)/ges/gesmarshal.h
- make -C $(GES_TOP)/ges gesmarshal.c
-
-LOCAL_SRC_FILES := $(addprefix ../ges/,$(LOCAL_SRC_FILES))
-
-LOCAL_CFLAGS := $(GST_CFLAGS) \
- -I$(GES_TOP) \
- $(shell $(PKG_CONFIG) gstreamer-pbutils --cflags)
-
-LOCAL_SHARED_LIBRARIES := \
- libgstpbutils-0.10 \
- libgstcontroller-0.10 \
- libgstvideo-0.10 \
- libgstreamer-0.10 \
- libglib-2.0 \
- libgthread-2.0 \
- libgmodule-2.0 \
- libgobject-2.0
-
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)