[Android] [PATCH 1/5] remove ANDROID_BIN (duplicate with NDK_TOOLCHAIN_PATH})

Thomas Guillem thomas at gllm.fr
Mon Feb 9 14:38:02 CET 2015


---
 compile-libvlc.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 1902fd8..54d077f 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -126,6 +126,7 @@ SRC_DIR=$PWD
 # Add the NDK toolchain to the PATH, needed both for contribs and for building
 # stub libraries
 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}
 
 ###############
@@ -224,17 +225,12 @@ fi
 echo "CFLAGS:            ${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
-
 ###########################
 # Build buildsystem tools #
 ###########################
 
+cd vlc
+
 export PATH=`pwd`/extras/tools/build/bin:$PATH
 echo "Building tools"
 cd extras/tools
@@ -345,8 +341,6 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 # CONFIGURE #
 #############
 
-CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
-
 if [ ! -e ./config.h ]; then
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
-- 
2.1.3



More information about the Android mailing list