Merge branch 'master' into 0.11

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

diff --git a/android/app.mk b/android/app.mk
index c579657..ffa9459 100644 (file)
--- a/android/app.mk
+++ b/android/app.mk
@@ -14,12 +14,10 @@ LOCAL_ARM_MODE := arm
 app_LOCAL_SRC_FILES_BASE:= \
        gst-libs/gst/app/gstappsrc.c \
        gst-libs/gst/app/gstappbuffer.c \
-       gst-libs/gst/app/gstappsink.c 
-app_LOCAL_SRC_FILES_ANDROID:= \
+       gst-libs/gst/app/gstappsink.c  \
        gst-libs/gst/app/gstapp-marshal.c
        
-LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(app_LOCAL_SRC_FILES_ANDROID))
+LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE))
 
 LOCAL_SHARED_LIBRARIES := \
     libgstreamer-0.11       \
@@ -31,23 +29,8 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libgstapp-0.11
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../gst-libs/gst/app   \
-    $(LOCAL_PATH)/../gst-libs                  \
-    $(LOCAL_PATH)/..                           \
-    $(LOCAL_PATH)                                      \
-       $(LOCAL_PATH)/gst-libs/gst/app          \
-    $(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
 #
@@ -55,5 +38,6 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_COPY_HEADERS_TO := $(gst_app_COPY_HEADERS_TO)
 LOCAL_COPY_HEADERS := $(gst_app_COPY_HEADERS)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)