From afab78e52e85c2928cefb84143d0337169dbfa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 26 Apr 2015 18:24:13 +0100 Subject: [PATCH] Remove obsolete Android build cruft This is not needed any longer. --- Android.mk | 30 ------------------------------ omx/Makefile.am | 15 --------------- 2 files changed, 45 deletions(-) delete mode 100644 Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index bc99d9f29e..0000000000 --- a/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -GST_OMX_TOP := $(LOCAL_PATH) - -GST_OMX_BUILT_SOURCES := omx/Android.mk - -GST_OMX_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_OMX_TOP))/%, $(GST_OMX_BUILT_SOURCES)) - -.PHONY: gst-omx-configure -gst-omx-configure: - cd $(GST_OMX_TOP) ; \ - CC="$(CONFIGURE_CC)" \ - CFLAGS="$(CONFIGURE_CFLAGS)" \ - LD=$(TARGET_LD) \ - LDFLAGS="$(CONFIGURE_LDFLAGS)" \ - CPP=$(CONFIGURE_CPP) \ - CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \ - PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \ - PKG_CONFIG_TOP_BUILD_DIR=/ \ - $(abspath $(GST_OMX_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \ - --prefix=/system --disable-orc --disable-valgrind --disable-gtk-doc && \ - for file in $(GST_OMX_BUILT_SOURCES); do \ - rm -f $$file && \ - make -C $$(dirname $$file) $$(basename $$file) ; \ - done - -CONFIGURE_TARGETS += gst-omx-configure - --include $(GST_OMX_TOP)/omx/Android.mk diff --git a/omx/Makefile.am b/omx/Makefile.am index 662bee2359..9371e8b967 100644 --- a/omx/Makefile.am +++ b/omx/Makefile.am @@ -93,18 +93,3 @@ EXTRA_DIST = \ gstomxvp8dec.h \ gstomxtheoradec.c \ gstomxtheoradec.h - -Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer \ - -:PROJECT libgstomx -:SHARED libgstomx \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstomx_la_SOURCES) \ - $(nodist_libgstomx_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstomx_la_CFLAGS) \ - -:LDFLAGS $(libgstomx_la_LDFLAGS) \ - $(libgstomx_la_LIBADD) \ - -ldl \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-$(GST_API_VERSION)' \ - > $@