[Android] [PATCH 3/7] jni: Link against libfaad too

[Rafaël Carré]

Le 2012-07-23 05:56, Edward Wang a écrit :
> This links properly so that linker errors don't occur:
> 
> modules/codec/faad.c:264: undefined reference to `NeAACDecInit2'
> modules/codec/faad.c:320: undefined reference to `NeAACDecDecode'
> ---
>  We can do it the other way around too, if you wish. (I never got an e-mail back from you about this)

Sorry but here we need faad/libav performance tests for both x86 and arm.

To be conservative I think faad should be explicitely disabled
everywhere for now until we have reasons to (selectively?) enable it.

> 
>  compile.sh                 |    1 +
>  configure.sh               |    1 +
>  vlc-android/jni/Android.mk |    2 +-
>  3 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/compile.sh b/compile.sh
> index be96044..50df87b 100755
> --- a/compile.sh
> +++ b/compile.sh
> @@ -94,6 +94,7 @@ cd contrib/android
>      --disable-vorbis \
>      --disable-sidplay2 \
>      --disable-samplerate \
> +    --enable-faad2 \
>      --enable-iconv
>  
>  # TODO: mpeg2, theora
> diff --git a/configure.sh b/configure.sh
> index 4cfca04..76c83a7 100755
> --- a/configure.sh
> +++ b/configure.sh
> @@ -61,6 +61,7 @@ sh $VLC_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $E
>                  --enable-audiotrack \
>                  --enable-android-surface \
>                  --enable-mkv \
> +                --enable-faad \
>                  --enable-taglib \
>                  --enable-iomx \
>                  --disable-vlc --disable-shared \
> diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
> index ca3b56e..255221a 100644
> --- a/vlc-android/jni/Android.mk
> +++ b/vlc-android/jni/Android.mk
> @@ -28,7 +28,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
>  	$(VLC_BUILD_DIR)/compat/.libs/libcompat.a \
>  	-ldl -lz -lm -llog \
>  	-ldvbpsi -lebml -lmatroska -ltag \
> -	-logg -lFLAC -ltheora \
> +	-logg -lFLAC -ltheora -lfaad \
>  	-lmpeg2 -ldca -la52 \
>  	-lavformat -lavcodec -lswscale -lavutil -lpostproc -lgsm -lopenjpeg \
>  	-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
>