Skip to content

V
vlc-2-2
Commit a2fe5294 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

android: remove workaround for old ndk 

Give the real host to configure
parent 2a8e01dd
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
extras/package/android/configure.sh
View file @ a2fe5294
...@@ -9,9 +9,6 @@ ANDROID_API=android-9 ...@@ -9,9 +9,6 @@ ANDROID_API=android-9
VLC_SOURCEDIR="`dirname $0`/../../.." 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" CFLAGS="-g -O2 -mlong-calls -fstrict-aliasing -fprefetch-loop-arrays -ffast-math"
LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined" LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined"
...@@ -44,7 +41,7 @@ STRIP="${CROSS_COMPILE}strip" \ ...@@ -44,7 +41,7 @@ STRIP="${CROSS_COMPILE}strip" \
RANLIB="${CROSS_COMPILE}ranlib" \ RANLIB="${CROSS_COMPILE}ranlib" \
AR="${CROSS_COMPILE}ar" \ AR="${CROSS_COMPILE}ar" \
PKG_CONFIG_LIBDIR="$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/lib/pkgconfig" \ 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-live555 --enable-realrtsp \
--enable-avformat \ --enable-avformat \
--enable-swscale \ --enable-swscale \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment