vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Tue Jan 24 23:43:08 2012 -0500| [9c8a32f4de9c4dc0231741c5dc95de9c3531ff2e] | committer: Rafaël Carré
android: remove workaround for old ndk Give the real host to configure (cherry picked from commit a2fe52949ec26f1e35f9a83f26e9ae01d7a2efab) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=9c8a32f4de9c4dc0231741c5dc95de9c3531ff2e --- extras/package/android/configure.sh | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/extras/package/android/configure.sh b/extras/package/android/configure.sh index 2ec42f9..8421ca9 100755 --- a/extras/package/android/configure.sh +++ b/extras/package/android/configure.sh @@ -9,9 +9,6 @@ ANDROID_API=android-9 VLC_SOURCEDIR="`dirname $0`/../../.." -# needed for old ndk: change all the arm-linux-androideabi to arm-eabi -# the --host is kept on purpose because otherwise libtool complains.. - CFLAGS="-g -O2 -mlong-calls -fstrict-aliasing -fprefetch-loop-arrays -ffast-math" LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined" @@ -44,7 +41,7 @@ STRIP="${CROSS_COMPILE}strip" \ RANLIB="${CROSS_COMPILE}ranlib" \ AR="${CROSS_COMPILE}ar" \ PKG_CONFIG_LIBDIR="$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/lib/pkgconfig" \ -sh $VLC_SOURCEDIR/configure --host=arm-eabi-linux --build=x86_64-unknown-linux $EXTRA_PARAMS \ +sh $VLC_SOURCEDIR/configure --host=arm-linux-androideabi --build=x86_64-unknown-linux $EXTRA_PARAMS \ --enable-live555 --enable-realrtsp \ --enable-avformat \ --enable-swscale \ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
