diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2011-01-27 17:28:51 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-04-11 07:23:21 +0200 |
| commit | 030f639a8e4eb1ab2fcf03301d0a39168e7e3ab7 (patch) | |
| tree | be856ddc7540abdd1eb2ff0098050aba8555f698 /android/interfaces.mk | |
| parent | d7413f2a72edb1921482d37e2774a3e21c3e2c49 (diff) | |
android: make it ready for androgenizer
Remove the android/ top dir
Fixe the Makefile.am to be androgenized
To build gstreamer for android we are now using androgenizer which generates the
needed Android.mk files.
Androgenizer can be found here:
http://git.collabora.co.uk/?p=user/derek/androgenizer.git
Diffstat (limited to 'android/interfaces.mk')
| -rw-r--r-- | android/interfaces.mk | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/android/interfaces.mk b/android/interfaces.mk index 91bb1d545..61564b3b7 100644 --- a/android/interfaces.mk +++ b/android/interfaces.mk @@ -15,12 +15,10 @@ gst_interfaces_COPY_HEADERS_BASE := \ gst-libs/gst/interfaces/tunerchannel.h \ gst-libs/gst/interfaces/tunernorm.h \ gst-libs/gst/interfaces/videoorientation.h \ - gst-libs/gst/interfaces/xoverlay.h -gst_interfaces_COPY_HEADERS_ANDROID := \ + gst-libs/gst/interfaces/xoverlay.h \ gst-libs/gst/interfaces/interfaces-enumtypes.h -gst_interfaces_COPY_HEADERS := $(addprefix ../,$(gst_interfaces_COPY_HEADERS_BASE)) \ - $(addprefix ../android/,$(gst_interfaces_COPY_HEADERS_ANDROID)) +gst_interfaces_COPY_HEADERS := $(addprefix ../,$(gst_interfaces_COPY_HEADERS_BASE)) include $(CLEAR_VARS) @@ -39,8 +37,7 @@ interfaces_LOCAL_SRC_FILES_BASE:= \ gst-libs/gst/interfaces/tunernorm.c \ gst-libs/gst/interfaces/tunerchannel.c \ gst-libs/gst/interfaces/videoorientation.c \ - gst-libs/gst/interfaces/xoverlay.c -interfaces_LOCAL_SRC_FILES_ANDROID:= \ + gst-libs/gst/interfaces/xoverlay.c \ gst-libs/gst/interfaces/interfaces-marshal.c \ gst-libs/gst/interfaces/interfaces-enumtypes.c @@ -57,24 +54,9 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libgstinterfaces-0.10 -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst-libs/gst/interfaces \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/gst-libs/gst/interfaces \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(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 # @@ -83,4 +65,6 @@ LOCAL_PRELINK_MODULE := false LOCAL_COPY_HEADERS_TO := $(gst_interfaces_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(gst_interfaces_COPY_HEADERS) +LOCAL_MODULE_TAGS := optional + include $(BUILD_SHARED_LIBRARY) |