Merge branch 'master' into 0.11

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

diff --git a/android/typefindfunctions.mk b/android/typefindfunctions.mk
index eb49a9d..c1c267c 100644 (file)
--- a/android/typefindfunctions.mk
+++ b/android/typefindfunctions.mk
@@ -12,6 +12,7 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(typefindfunctions_LOCAL_SRC_FILES))
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.11       \
     libgstbase-0.11         \
+    libgstpbutils-0.11     \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
@@ -19,23 +20,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgsttypefindfunctions
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/typefind              \
-    $(LOCAL_PATH)/../gst-libs                  \
-    $(LOCAL_PATH)/..                           \
-    $(LOCAL_PATH)                                      \
-    $(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         -DGSTREAMER_BUILT_FOR_ANDROID
+LOCAL_CFLAGS := -DHAVE_CONFIG_H         -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
 #
 # define LOCAL_PRELINK_MODULE to false to not use pre-link map
 #
@@ -43,5 +29,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)