[vlc-devel] [PATCH 14/21] Enable the iomx module

[Martin Storsjö]

Building with IOMX requires private Android headers from the
Android source tree, namely the frameworks/base and
system/core repositories. This API is not public, has no
ABI guarantees and isn't supported.
---
 extras/package/android/Makefile     |    2 +-
 extras/package/android/configure.sh |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/extras/package/android/Makefile b/extras/package/android/Makefile
index b384b43..a287660 100644
--- a/extras/package/android/Makefile
+++ b/extras/package/android/Makefile
@@ -64,7 +64,7 @@ $(APK_MK):
 	 printf "\t$$prefix$$VLC_BUILD_DIR/compat/.libs/libcompat.a \\\\\n"       >> $(APK_MK); \
 	 printf "\t$$prefix$$VLC_BUILD_DIR/src/.libs/libvlc.a \\\\\n"             >> $(APK_MK); \
 	 printf "\t$$prefix$$VLC_BUILD_DIR/src/.libs/libvlccore.a \\\\\n"         >> $(APK_MK); \
-	 printf "\t-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -ltheora -lavformat -lavcodec -lavcore -lavutil -lpostproc -lswscale -lmpeg2 -lgcc -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lebml -lmatroska\\\\\n" >> $(APK_MK); \
+	 printf "\t-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -ltheora -lavformat -lavcodec -lavcore -lavutil -lpostproc -lswscale -lmpeg2 -lgcc -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lebml -lmatroska -L$(ANDROID_LIBS) -lstagefright -lmedia -lutils -lbinder\\\\\n" >> $(APK_MK); \
 	 printf "\t$$ANDROID_STDCPP\n"                                              >> $(APK_MK); \
 	 printf "include \$$(BUILD_SHARED_LIBRARY)\n"                             >> $(APK_MK)
 
diff --git a/extras/package/android/configure.sh b/extras/package/android/configure.sh
index 984fb92..0b8e196 100755
--- a/extras/package/android/configure.sh
+++ b/extras/package/android/configure.sh
@@ -30,6 +30,11 @@ else
 	EXTRA_PARAMS=" --disable-neon"
 fi
 
+if [ -n "$ANDROID_SYS_HEADERS" ]; then
+	ANDROID_CPPINCLUDE="$ANDROID_CPPINCLUDE -I${ANDROID_SYS_HEADERS}/frameworks/base/include -I${ANDROID_SYS_HEADERS}/system/core/include"
+	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L${ANDROID_LIBS}"
+fi
+
 PATH="$ANDROID_BIN:$PATH" \
 CPPFLAGS="-I$ANDROID_INCLUDE $ANDROID_CPPINCLUDE" \
 LDFLAGS="-Wl,-rpath-link=$ANDROID_LIB,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -Wl,-shared -L$ANDROID_LIB $EXTRA_LDFLAGS" \
@@ -102,4 +107,4 @@ sh $VLC_SOURCEDIR/configure --host=arm-eabi-linux --build=x86_64-unknown-linux $
                 --disable-gles1 --disable-gles2 \
                 --disable-goom \
                 --disable-projectm \
-                --enable-omxil
+                --enable-iomx
-- 
1.7.2.5