X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Faudioconvert.mk;h=3afb78976a4c39718e4b758e67419cc979a73105;hb=65307dd1323ba8200893b51c917bb175f11e5e4f;hp=ef2537f84841f078f64c611275809447ebf3c44d;hpb=4007076b55f6809f0b834d1041167e157ba822be;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/android/audioconvert.mk b/android/audioconvert.mk
index ef2537f..3afb789 100644
--- a/android/audioconvert.mk
+++ b/android/audioconvert.mk
@@ -7,6 +7,7 @@ LOCAL_ARM_MODE := arm
 audioconvert_LOCAL_SRC_FILES:= \
 	gst/audioconvert/gstaudioconvert.c \
 	gst/audioconvert/audioconvert.c \
+	gst/audioconvert/gstaudioconvertorc-dist.c \
 	gst/audioconvert/gstchannelmix.c \
 	gst/audioconvert/gstaudioquantize.c \
 	gst/audioconvert/plugin.c 
@@ -14,40 +15,26 @@ audioconvert_LOCAL_SRC_FILES:= \
 LOCAL_SRC_FILES:= $(addprefix ../,$(audioconvert_LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
-    libgstaudio-0.11        \
-    libgstreamer-0.11       \
-    libgstbase-0.11         \
+    libgstaudio-1.0        \
+    libgstreamer-1.0       \
+    libgstbase-1.0         \
     libglib-2.0             \
     libgthread-2.0          \
     libgmodule-2.0          \
     libgobject-2.0 			\
-    libgstpbutils-0.11
+    libgstpbutils-1.0
 
 LOCAL_MODULE:= libgstaudioconvert
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst/audioconvert   \
-    $(LOCAL_PATH)/..         	  		\
-    $(LOCAL_PATH)/../gst-libs      		\
-    $(LOCAL_PATH)      			 		\
-	$(LOCAL_PATH)/gst-libs/gst/audio    \
-    $(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
 #
 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
+#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)