Update the android configure script.

diff --git a/extras/package/android/configure.sh b/extras/package/android/configure.sh
index 35e760f2aee98331e2df5e9633ca31afaa51fb52..9afadd7f04218fabbd143a8d83b89136b6aa4e8d 100755 (executable)
--- a/extras/package/android/configure.sh
+++ b/extras/package/android/configure.sh
@@ -5,11 +5,14 @@ if [ -z "$ANDROID_NDK" ]; then
     exit 1
 fi
 
+ANDROID_API=android-8
+
 ANDROID_BIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/
-ANDROID_INCLUDE=$ANDROID_NDK/platforms/android-9/arch-arm/usr/include
-ANDROID_LIB=$ANDROID_NDK/platforms/android-9/arch-arm/usr/lib
+ANDROID_INCLUDE=$ANDROID_NDK/platforms/$ANDROID_API/arch-arm/usr/include
+ANDROID_LIB=$ANDROID_NDK/platforms/$ANDROID_API/arch-arm/usr/lib
+GCC_PREFIX=${ANDROID_BIN}/arm-linux-androideabi-
 
-VLC_SOURCEDIR="`pwd`/.."
+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..
@@ -17,10 +20,13 @@ VLC_SOURCEDIR="`pwd`/.."
 PATH="$ANDROID_BIN":$PATH \
 CPPFLAGS="-I$ANDROID_INCLUDE" \
 LDFLAGS="-Wl,-rpath-link=$ANDROID_LIB,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -Wl,-shared -L$ANDROID_LIB" \
-CFLAGS="" \
+CFLAGS="-nostdlib" \
+CXXFLAGS="-nostdlib" \
 LIBS="-lc -ldl -lgcc" \
-CC="arm-linux-androideabi-gcc -nostdlib" CXX="arm-linux-androideabi-g++ -nostdlib" \
-NM="arm-linux-androideabi-nm" STRIP="arm-linux-androideabi-strip" \
+CC="${GCC_PREFIX}gcc" \
+CXX="${GCC_PREFIX}g++" \
+NM="${GCC_PREFIX}nm" \
+STRIP="${GCC_PREFIX}strip" \
 PKG_CONFIG_LIBDIR="$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/lib/pkgconfig" \
 sh ../configure --host=arm-eabi-linux --build=x86_64-unknown-linux \
                 --enable-static-modules \
@@ -31,7 +37,6 @@ sh ../configure --host=arm-eabi-linux --build=x86_64-unknown-linux \
                 --disable-mkv \
                 --disable-live555 \
                 --disable-libgcrypt \
-                --disable-remoteosd \
                 --disable-lua \
                 --enable-swscale \
                 --enable-avcodec \
@@ -41,7 +46,4 @@ sh ../configure --host=arm-eabi-linux --build=x86_64-unknown-linux \
                 --disable-vcd \
                 --disable-v4l2 \
                 --disable-atmo \
-                --disable-vlc \
-                --enable-opensles \
-                --enable-android \
-                --enable-egl-android
+                --disable-vlc