summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2012-04-25 08:59:28 (GMT)
committerArun Raghavan <arun.raghavan@collabora.co.uk>2012-04-25 09:06:50 (GMT)
commit863027faabfe99fa383a72b9434ef8402ba758f6 (patch)
treecaae7614ecb4e2381f0e7bba1b0356d7b2b9d78c
parent480d43f67f52408759cb89b34873b67ca974903b (diff)
downloadgstreamer-0.10_ndk_bundle-863027faabfe99fa383a72b9434ef8402ba758f6.tar.gz
gstreamer-0.10_ndk_bundle-863027faabfe99fa383a72b9434ef8402ba758f6.tar.xz
Add libfaac for the faac plugin
-rw-r--r--.gitmodules3
m---------faac0
-rw-r--r--jni/Android.mk7
3 files changed, 8 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 1a6b54c..1ee1b80 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,6 @@
[submodule "android_headers"]
path = android_headers
url = git://git.collabora.co.uk/git/android/android_headers.git
+[submodule "faac"]
+ path = faac
+ url = git://git.collabora.co.uk/git/android/faac.git
diff --git a/faac b/faac
new file mode 160000
+Subproject f3005649097280e28b1a36bf001906c90693438
diff --git a/jni/Android.mk b/jni/Android.mk
index 71b4b24..64d2961 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -75,7 +75,8 @@ CONFIGURE_LDFLAGS += -L$(SYSROOT)/usr/lib -L$(TARGET_OUT) -L$(GSTREAMER_AGGREGAT
CONFIGURE_INCLUDES += -I$(SYSROOT)/usr/include \
-I$(GSTREAMER_AGGREGATE_TOP)/libid3tag \
-I$(GSTREAMER_AGGREGATE_TOP)/libmad \
- -I$(GSTREAMER_AGGREGATE_TOP)/faad/include
+ -I$(GSTREAMER_AGGREGATE_TOP)/faad/include \
+ -I$(GSTREAMER_AGGREGATE_TOP)/faac/include
CONFIGURE_CPP := $(TOOLCHAIN_PREFIX)cpp
LIB := $(SYSROOT)/usr/lib
else
@@ -106,7 +107,8 @@ CONFIGURE_INCLUDES += \
-I$(abspath $(TOP)/external/zlib) \
-I$(GSTREAMER_AGGREGATE_TOP)/libid3tag \
-I$(GSTREAMER_AGGREGATE_TOP)/libmad \
- -I$(GSTREAMER_AGGREGATE_TOP)/faad/include
+ -I$(GSTREAMER_AGGREGATE_TOP)/faad/include \
+ -I$(GSTREAMER_AGGREGATE_TOP)/faac/include
endif
CONFIGURE_CPPFLAGS := \
@@ -130,6 +132,7 @@ CONFIGURE_TARGETS :=
#only in this order for reference... this is optimal build order
include $(GSTREAMER_AGGREGATE_TOP)/x264/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/faad/Android.mk
+include $(GSTREAMER_AGGREGATE_TOP)/faac/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/ogg/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/libmad/Android.mk
include $(GSTREAMER_AGGREGATE_TOP)/libid3tag/Android.mk