Commit 34aa3eb8 authored by Thomas Guillem's avatar Thomas Guillem

remove ANDROID_BIN (duplicate with NDK_TOOLCHAIN_PATH})

parent 752a59ad
...@@ -126,6 +126,7 @@ SRC_DIR=$PWD ...@@ -126,6 +126,7 @@ SRC_DIR=$PWD
# Add the NDK toolchain to the PATH, needed both for contribs and for building # Add the NDK toolchain to the PATH, needed both for contribs and for building
# stub libraries # stub libraries
NDK_TOOLCHAIN_PATH=`echo ${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin` NDK_TOOLCHAIN_PATH=`echo ${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin`
CROSS_COMPILE=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-
export PATH=${NDK_TOOLCHAIN_PATH}:${PATH} export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
############### ###############
...@@ -224,11 +225,6 @@ fi ...@@ -224,11 +225,6 @@ fi
echo "CFLAGS: ${CFLAGS}" echo "CFLAGS: ${CFLAGS}"
echo "EXTRA_CFLAGS: ${EXTRA_CFLAGS}" echo "EXTRA_CFLAGS: ${EXTRA_CFLAGS}"
ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
export PATH=$ANDROID_BIN:$PATH
################################################################################
cd vlc cd vlc
########################### ###########################
...@@ -345,8 +341,6 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR ...@@ -345,8 +341,6 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
# CONFIGURE # # CONFIGURE #
############# #############
CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
if [ ! -e ./config.h ]; then if [ ! -e ./config.h ]; then
CPPFLAGS="$CPPFLAGS" \ CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \ CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
......
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