diff options
Diffstat (limited to 'android/video.mk')
| -rw-r--r-- | android/video.mk | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/android/video.mk b/android/video.mk index 15093d533..f92949a1a 100644 --- a/android/video.mk +++ b/android/video.mk @@ -5,13 +5,10 @@ gst_video_COPY_HEADERS_TO := gstreamer-0.11/gst/video gst_video_COPY_HEADERS_BASE := \ gst-libs/gst/video/gstvideofilter.h \ gst-libs/gst/video/gstvideosink.h \ - gst-libs/gst/video/video.h -gst_video_COPY_HEADERS_ANDROID := \ + gst-libs/gst/video/video.h \ gst-libs/gst/video/video-enumtypes.h -gst_video_COPY_HEADERS := $(addprefix ../,$(gst_video_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_video_COPY_HEADERS_ANDROID)) - +gst_video_COPY_HEADERS := $(addprefix ../,$(gst_video_COPY_HEADERS_BASE)) include $(CLEAR_VARS) @@ -20,12 +17,11 @@ LOCAL_ARM_MODE := arm video_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/video/video.c \ gst-libs/gst/video/gstvideosink.c \ - gst-libs/gst/video/gstvideofilter.c -video_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/video/gstvideofilter.c \ + gst-libs/gst/video/convertframe.c \ gst-libs/gst/video/video-enumtypes.c -LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE)) \ - $(addprefix ../android/,$(video_LOCAL_SRC_FILES_ANDROID)) +LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE)) LOCAL_SHARED_LIBRARIES := \ libgstreamer-0.11 \ @@ -37,23 +33,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstvideo-0.11 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/video \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/video \ - $(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 # @@ -61,5 +42,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_video_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_video_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) |