Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / android / decodebin2.mk

diff --git a/android/decodebin2.mk b/android/decodebin2.mk
index 929219d..c9d32f2 100644 (file)
--- a/android/decodebin2.mk
+++ b/android/decodebin2.mk
@@ -7,13 +7,10 @@ LOCAL_ARM_MODE := arm
 decodebin2_LOCAL_SRC_FILES_BASE:= \
        gst/playback/gstdecodebin2.c \
     gst/playback/gsturidecodebin.c \
-       gst/playback/gstfactorylists.c \
-       gst/playback/gstplay-enum.c 
-decodebin2_LOCAL_SRC_FILES_ANDROID:= \
+       gst/playback/gstplay-enum.c  \
        gst/playback/gstplay-marshal.c
 
-LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(decodebin2_LOCAL_SRC_FILES_ANDROID))
+LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE))
 
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.11       \
@@ -26,23 +23,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstdecodebin2
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/playback              \
-    $(LOCAL_PATH)/../gst-libs                  \
-    $(LOCAL_PATH)/..                           \
-    $(LOCAL_PATH)                                      \
-       $(LOCAL_PATH)/gst/playback              \
-    $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-    $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
-
-ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
-LOCAL_SHARED_LIBRARIES += libicuuc 
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H        
+LOCAL_CFLAGS := -DHAVE_CONFIG_H         \
+       $(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -50,5 +32,6 @@ LOCAL_PRELINK_MODULE := false
 
 #It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)